summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2013-09-02 09:48:51 +0200
committerVijay Bellur <vbellur@redhat.com>2013-09-02 23:30:47 -0700
commit9032b1dfbbf8d0bbf8731959ad1048f7bbc530a3 (patch)
tree300029bcb7964ce0dfc69e05ce8243f8de161874 /contrib
parentba24c7c3c29a41029a1762c238288d00b875ddef (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: Ifa6cd6476bf1939e009142ed4ed1b53b9c3171bd Master-Branch-Change-ID: I440591344a6a5af7b2018e37a2a1fda9de8b5ab2 Bug: 996768 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/5752 Reviewed-by: Shishir Gowda <sgowda@redhat.com> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com> 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 a222aac..922d9e4 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)