diff options
Diffstat (limited to 'xlators/mount')
-rw-r--r-- | xlators/mount/fuse/src/fuse-resolve.c | 2 | ||||
-rwxr-xr-x | xlators/mount/fuse/utils/mount.glusterfs.in | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/xlators/mount/fuse/src/fuse-resolve.c b/xlators/mount/fuse/src/fuse-resolve.c index 8565ce0e4..17d76d46b 100644 --- a/xlators/mount/fuse/src/fuse-resolve.c +++ b/xlators/mount/fuse/src/fuse-resolve.c @@ -381,6 +381,8 @@ fuse_migrate_fd_task (void *data) basefd = state->fd; basefd_ctx = fuse_fd_ctx_get (state->this, basefd); + if (!basefd_ctx) + goto out; LOCK (&basefd->lock); { diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index d22f6a69b..b7718b35f 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -446,6 +446,13 @@ with_options() "use-readdirp") use_readdirp=$value ;; + "no-root-squash") + if [ $value == "yes" ] || + [ $value == "on" ] || + [ $value == "enable" ] || + [ $value == "true" ] ; then + no_root_squash=1; + fi ;; "root-squash") if [ $value == "no" ] || [ $value == "off" ] || |