From 2e093c728c856a41399ffdcf33c91d21c3a2f0f2 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Tue, 11 Feb 2014 13:16:38 +0530 Subject: mount.glusterfs: backward compatible option for root-squashing Change-Id: I74fa6686cff84cfad4a2587a0061e6bb2beea081 BUG: 954057 Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.org/6975 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/mount/fuse/utils/mount.glusterfs.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'xlators/mount') 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" ] || -- cgit From da7972c10cd0495621ea95c186db86cfa8d997b6 Mon Sep 17 00:00:00 2001 From: Poornima Date: Tue, 4 Feb 2014 22:52:14 +0000 Subject: mount/fuse: Fix the NULL dereference errors reported by coverity. Change-Id: I9df57e11b115d7323931735c86b586c0b65fa414 BUG: 789278 Signed-off-by: Poornima Reviewed-on: http://review.gluster.org/6990 Reviewed-by: Vijay Bellur Tested-by: Gluster Build System --- xlators/mount/fuse/src/fuse-resolve.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'xlators/mount') 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); { -- cgit