Branch b1_6

b=16750
i=nathan.rutman
i=sheng.yang

Description: service mount cannot take device name with ":"
Details    : Only when device name contains ":/" will mount treat it as
             client mount.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index a8dc12b..7eaf9e4 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -39,6 +39,12 @@ tbd Sun Microsystems, Inc.
          old (verbose) output can be obtained by using -v option.
 
 Severity   : major
+Bugzilla   : 16750
+Description: service mount cannot take device name with ":"
+Details    : Only when device name contains ":/" will mount treat it as
+             client mount.
+
+Severity   : major
 Bugzilla   : 16561
 Description: Hitting mdc_commit_close() ASSERTION
 Details    : Properly handle request reference release in

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index dbba7d9..d7e0aac 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -1884,8 +1884,9 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
                 goto invalid;
         }
 
-        s1 = strrchr(devname, ':');
+        s1 = strstr(devname, ":/");
         if (s1) {
+                ++s1;
                 lmd->lmd_flags = LMD_FLG_CLIENT;
                 /* Remove leading /s from fsname */
                 while (*++s1 == '/') ;