diff options
author | Csaba Henk <csaba@gluster.com> | 2011-05-15 04:52:33 +0000 |
---|---|---|
committer | Anand Avati <avati@gluster.com> | 2011-05-19 15:41:47 -0700 |
commit | c5d781e05599e9e7ad736d42c9c1033992c76ded (patch) | |
tree | aff88649bc98a6c8babc3d75760fae2ef36b4cc3 /contrib/macfuse/mount_darwin.c | |
parent | 357df32e16dd21e7aedb699c7bd99cac9b95a040 (diff) |
upon daemonizing, wait on mtab update to terminate in parent
This fixes the race in between the mtab update attempts of mount and umount
when we do a lazy umount right after mounting, in order to hide the given fs
instance; yet this way we still avoid the deadlock of the fs and mount which
we can hit if we wait unconditionally for the mtab update to terminate (cf.
bz #511).
Signed-off-by: Csaba Henk <csaba@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2690 (race between mtab updates of mount and umount)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2690
Diffstat (limited to 'contrib/macfuse/mount_darwin.c')
-rw-r--r-- | contrib/macfuse/mount_darwin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/macfuse/mount_darwin.c b/contrib/macfuse/mount_darwin.c index 9d87fca3596..c485583e96b 100644 --- a/contrib/macfuse/mount_darwin.c +++ b/contrib/macfuse/mount_darwin.c @@ -133,7 +133,8 @@ Return: } int -gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param) +gf_fuse_mount (const char *mountpoint, char *fsname, char *mnt_param, + pid_t *mtab_pid /* not used on OS X */) { int fd, pid; int result; |