From 590ae48c65a60c93c2e5407e3f663cef3daacc55 Mon Sep 17 00:00:00 2001
From: Amar Tumballi <amarts@redhat.com>
Date: Wed, 19 Jul 2017 23:08:05 +0530
Subject: glusterfsd: allow subdir mount

Changes:

1. Take subdir mount option in client (mount.gluster / glusterfsd)
2. Pass the subdir mount to server-handshake (from client-handshake)
3. Handle subdir-mount dir's lookup in server-first-lookup and handle
   all fops resolution accordingly with proper gfid of subdir
4. Change the auth/addr module to handle the multiple subdir entries
   in option, and valid parsing.

How to use the feature:

`# mount -t glusterfs $hostname:/$volname/$subdir /$mount_point`
Or
`# mount -t glusterfs $hostname:/$volname -osubdir_mount=$subdir /$mount_point`

Option can be set like:

`# gluster volume set <volname> auth.allow "/subdir1(192.168.1.*),/(192.168.10.*),/subdir2(192.168.8.*)"`

Updates #175

Change-Id: I7ea57f76ddbe6c3862cfe02e13f89e8a39719e11
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Reviewed-on: https://review.gluster.org/17141
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
---
 xlators/mount/fuse/utils/mount.glusterfs.in | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'xlators/mount')

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 66dd7cd960f..826991ba402 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -312,6 +312,10 @@ start_glusterfs ()
         cmd_line=$(echo "$cmd_line --fuse-mountopts=$fuse_mountopts");
     fi
 
+    if [ -n "$subdir_mount" ]; then
+        cmd_line=$(echo "$cmd_line --subdir-mount=/$subdir_mount");
+    fi
+
     cmd_line=$(echo "$cmd_line $mount_point");
     $cmd_line;
     if [ $? -ne 0 ]; then
@@ -430,6 +434,9 @@ with_options()
         "volume-id")
             volume_id=$value
             ;;
+        "subdir-mount")
+            subdir_mount=$value
+            ;;
         "volfile-check")
             volfile_check=$value
             ;;
@@ -655,7 +662,15 @@ main ()
         server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:%.\-]*\):.*/\1/p');
         volume_str=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');
         [ -n "$volume_str" ] && {
-            volume_id="$volume_str";
+            volume_id=$volume_str
+            volume_str_temp=$volume_str
+            [ ${volume_str:0:1} = '/' ] && {
+                volume_str_temp=${volume_str:1}
+            }
+            [ $(echo $volume_str_temp | grep -c "/") -eq 1 ] && {
+                volume_id=$(echo "$volume_str_temp" | cut -f1 -d '/');
+                subdir_mount=$(echo "$volume_str_temp" | cut -f2- -d '/');
+            }
         }
         volfile_loc="";
         [ -z "$volume_id" -o -z "$server_ip" ] && {
-- 
cgit