diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-04 14:42:40 +0000 |
| commit | 0de07f4189cbd191a765c60ed3d7c72f72112e68 (patch) | |
| tree | 83781a0df06c9110c6f3db12caad23ea00832b53 /xlators/mount | |
| parent | c28972ea53cc7cdb91c7aac01754dd7f0b66e1a7 (diff) | |
| parent | 9f45d0f6212d6d5c96dafc4aba73d9d12b39c3d6 (diff) | |
Merge branch 'upstream' into merge
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Conflicts:
api/src/glfs-fops.c
libglusterfs/src/syncop.c
libglusterfs/src/syncop.h
Change-Id: I8c3fa7a20fb167d9e6bc2749e177c0c8b366827b
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" ] || |