chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: htonl() is weird, let's use htobe32() instead (#3538)
[elogind.git]
/
src
/
basic
/
mount-util.c
diff --git
a/src/basic/mount-util.c
b/src/basic/mount-util.c
index da34ef6e71a7d1c3cd33012f68e6727c4ef652ec..d5ec2afdd99110d5f44f8578feb02d7462316adc 100644
(file)
--- a/
src/basic/mount-util.c
+++ b/
src/basic/mount-util.c
@@
-47,7
+47,7
@@
static int fd_fdinfo_mnt_id(int fd, const char *filename, int flags, int *mnt_id
if ((flags & AT_EMPTY_PATH) && isempty(filename))
xsprintf(path, "/proc/self/fdinfo/%i", fd);
else {
if ((flags & AT_EMPTY_PATH) && isempty(filename))
xsprintf(path, "/proc/self/fdinfo/%i", fd);
else {
- subfd = openat(fd, filename, O_
RDONLY|O_CLOEXEC|O_NOCTTY
|O_PATH);
+ subfd = openat(fd, filename, O_
CLOEXEC
|O_PATH);
if (subfd < 0)
return -errno;
if (subfd < 0)
return -errno;
@@
-230,7
+230,7
@@
int path_is_mount_point(const char *t, int flags) {
if (!parent)
return -ENOMEM;
if (!parent)
return -ENOMEM;
- fd = openat(AT_FDCWD, parent, O_
RDONLY|O_NONBLOCK|O_
DIRECTORY|O_CLOEXEC|O_PATH);
+ fd = openat(AT_FDCWD, parent, O_DIRECTORY|O_CLOEXEC|O_PATH);
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
@@
-499,7
+499,9
@@
bool fstype_is_network(const char *fstype) {
"nfs4\0"
"gfs\0"
"gfs2\0"
"nfs4\0"
"gfs\0"
"gfs2\0"
- "glusterfs\0";
+ "glusterfs\0"
+ "pvfs2\0" /* OrangeFS */
+ ;
const char *x;
const char *x;