summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2013-07-03 09:45:41 +0200
committerVijay Bellur <vbellur@redhat.com>2013-07-03 22:33:30 -0700
commit37d2c255e46eea98df473fbc693931462882392e (patch)
treeea67494798b886184ee2032ad2f8bf1ff4c030a6 /contrib
parent291344f9c80fe1a3c0fe784a1642da6795dcf5a4 (diff)
fuse: pass the mountflags to older (< 2.6.21) kernels
The change for Bug 853895 fixed mounting volumes read-only for recent kernels. Older kernels fail the first mount() syscall, and the second mount() did not add the 'mountflags'. Full analysis and a description for reproducing is in the bugreport. The test included in http://review.gluster.org/4163 would have caught this problem when the tests are executed on RHEL-5 or similar systems. Change-Id: I440591344a6a5af7b2018e37a2a1fda9de8b5ab2 Bug: 980770 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/5278 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fuse-lib/mount.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c
index a222aaca4..922d9e464 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -201,7 +201,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
goto out;
}
- ret = mount (source, mountpoint, fstype, 0,
+ ret = mount (source, mountpoint, fstype, mountflags,
mnt_param_mnt);
}
if (ret == -1)