b=19406

fix a bug in search_fsname which doesn't find
the correct mountpoint if there are several Lustre
filesystems mounted within each other

i=adilger@sun.com
i=hongchao.zhang@sun.com

diff --git a/lustre/include/lustre/liblustreapi.h b/lustre/include/lustre/liblustreapi.h
index 0c88b12..84a5f14 100644 (file)
--- a/lustre/include/lustre/liblustreapi.h
+++ b/lustre/include/lustre/liblustreapi.h
@@ -153,6 +153,8 @@ extern int llapi_file_get_lov_uuid(const char *path, struct obd_uuid *lov_uuid);
 extern int llapi_file_fget_lov_uuid(int fd, struct obd_uuid *lov_uuid);
 extern int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count);
 extern int llapi_is_lustre_mnttype(const char *type);
+extern int llapi_search_mounts(const char *pathname, int index, 
+                               char *mntdir, char *fsname);
 extern int parse_size(char *optarg, unsigned long long *size,
                       unsigned long long *size_units, int bytes_spec);
 extern void llapi_ping_target(char *obd_type, char *obd_name,

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index e288707..ac0b9b1 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -839,33 +839,21 @@ static int lfs_getstripe(int argc, char **argv)
 
 static int lfs_osts(int argc, char **argv)
 {
-        FILE *fp;
-        struct mntent *mnt = NULL;
+        char mntdir[PATH_MAX] = {'\0'};
         struct find_param param;
-        int rc=0;
+        int index = 0, rc = 0;
 
         if (argc != 1)
                 return CMD_HELP;
 
-        fp = setmntent(MOUNTED, "r");
-
-        if (fp == NULL) {
-                 fprintf(stderr, "%s: setmntent(%s): %s:", argv[0], MOUNTED,
-                        strerror (errno));
-        } else {
-                mnt = getmntent(fp);
-                while (feof(fp) == 0 && ferror(fp) ==0) {
-                        memset(&param, 0, sizeof(param));
-                        if (llapi_is_lustre_mnt(mnt)) {
-                                rc = llapi_getstripe(mnt->mnt_dir, &param);
-                                if (rc)
-                                        fprintf(stderr,
-                                               "error: %s: failed on %s\n",
-                                               argv[0], mnt->mnt_dir);
-                        }
-                        mnt = getmntent(fp);
+        while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) {
+                memset(&param, 0, sizeof(param));
+                rc = llapi_getstripe(mntdir, &param);
+                if (rc) {
+                        fprintf(stderr, "error: %s: failed on %s\n",
+                                argv[0], mntdir);
                 }
-                endmntent(fp);
+                memset(mntdir, 0, PATH_MAX);
         }
 
         return rc;
@@ -888,41 +876,6 @@ static int lfs_osts(int argc, char **argv)
 #define RSF     "%5s"
 #define RDF     "%4d%%"
 
-static int path2mnt(char *path, FILE *fp, char *mntdir, int dir_len)
-{
-        char rpath[PATH_MAX] = {'\0'};
-        struct mntent *mnt;
-        int rc, len, out_len = 0;
-
-        if (!realpath(path, rpath)) {
-                rc = -errno;
-                fprintf(stderr, "error: lfs df: invalid path '%s': %s\n",
-                        path, strerror(-rc));
-                return rc;
-        }
-
-        len = 0;
-        mnt = getmntent(fp);
-        while (feof(fp) == 0 && ferror(fp) == 0) {
-                if (llapi_is_lustre_mnt(mnt)) {
-                        len = strlen(mnt->mnt_dir);
-                        if (len > out_len &&
-                            !strncmp(rpath, mnt->mnt_dir, len)) {
-                                out_len = len;
-                                memset(mntdir, 0, dir_len);
-                                strncpy(mntdir, mnt->mnt_dir, dir_len);
-                        }
-                }
-                mnt = getmntent(fp);
-        }
-
-        if (out_len > 0)
-                return 0;
-
-        fprintf(stderr, "error: lfs df: %s isn't mounted on lustre\n", path);
-        return -EINVAL;
-}
-
 static int showdf(char *mntdir, struct obd_statfs *stat,
                   char *uuid, int ishow, int cooked,
                   char *type, int index, int rc)
@@ -1083,9 +1036,7 @@ static int mntdf(char *mntdir, int ishow, int cooked)
 
 static int lfs_df(int argc, char **argv)
 {
-        FILE *fp;
         char *path = NULL;
-        struct mntent *mnt = NULL;
         char *mntdir = NULL;
         int ishow = 0, cooked = 0;
         int c, rc = 0;
@@ -1106,14 +1057,6 @@ static int lfs_df(int argc, char **argv)
         if (optind < argc )
                 path = argv[optind];
 
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                rc = -errno;
-                fprintf(stderr, "error: %s: open %s failed( %s )\n",
-                        argv[0], MOUNTED, strerror(errno));
-                return rc;
-        }
-
         if ((mntdir = malloc(PATH_MAX)) == NULL) {
                 fprintf(stderr, "error: cannot allocate %d bytes\n",
                         PATH_MAX);
@@ -1122,28 +1065,29 @@ static int lfs_df(int argc, char **argv)
         memset(mntdir, 0, PATH_MAX);
 
         if (path) {
-                rc = path2mnt(path, fp, mntdir, PATH_MAX);
-                if (rc) {
-                        endmntent(fp);
-                        free(mntdir);
+                char rpath[PATH_MAX] = {'\0'};
+
+                if (!realpath(path, rpath)) {
+                        rc = -errno;
+                        fprintf(stderr, "error: invalid path '%s': %s\n",
+                                path, strerror(-rc));
                         return rc;
                 }
 
-                rc = mntdf(mntdir, ishow, cooked);
-                printf("\n");
-                endmntent(fp);
+                rc = llapi_search_mounts(rpath, 0, mntdir, NULL);
+                if (rc == 0 && mntdir[0] != '\0') {
+                        rc = mntdf(mntdir, ishow, cooked);
+                        printf("\n");
+                }
         } else {
-                mnt = getmntent(fp);
-                while (feof(fp) == 0 && ferror(fp) == 0) {
-                        if (llapi_is_lustre_mnt(mnt)) {
-                                rc = mntdf(mnt->mnt_dir, ishow, cooked);
-                                if (rc)
-                                        break;
-                                printf("\n");
-                        }
-                        mnt = getmntent(fp);
+                int index = 0;
+
+                while (llapi_search_mounts(NULL, index++, mntdir, NULL) == 0) {
+                        rc = mntdf(mntdir, ishow, cooked);
+                        if (rc)
+                                break;
+                        printf("\n");
                 }
-                endmntent(fp);
         }
 
         free(mntdir);
@@ -1153,9 +1097,8 @@ static int lfs_df(int argc, char **argv)
 static int lfs_check(int argc, char **argv)
 {
         int rc;
-        FILE *fp;
-        struct mntent *mnt = NULL;
         int num_types = 1;
+        char mntdir[PATH_MAX] = {'\0'};
         char *obd_types[2];
         char obd_type1[4];
         char obd_type2[4];
@@ -1180,27 +1123,14 @@ static int lfs_check(int argc, char **argv)
                         return CMD_HELP;
         }
 
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                 fprintf(stderr, "setmntent(%s): %s:", MOUNTED,
-                        strerror (errno));
-        } else {
-                mnt = getmntent(fp);
-                while (feof(fp) == 0 && ferror(fp) ==0) {
-                        if (llapi_is_lustre_mnt(mnt))
-                                break;
-                        mnt = getmntent(fp);
-                }
-                endmntent(fp);
-        }
-
-        if (!mnt) {
+        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
+        if (rc < 0 || mntdir[0] == '\0') {
                 fprintf(stderr, "No suitable Lustre mount found\n");
-                return -1;
+                return rc;
         }
 
         rc = llapi_target_iterate(num_types, obd_types,
-                                  mnt->mnt_dir, llapi_ping_target);
+                                  mntdir, llapi_ping_target);
 
         if (rc)
                 fprintf(stderr, "error: %s: %s status failed\n",
@@ -1212,8 +1142,7 @@ static int lfs_check(int argc, char **argv)
 
 static int lfs_catinfo(int argc, char **argv)
 {
-        FILE *fp;
-        struct mntent *mnt = NULL;
+        char mntdir[PATH_MAX] = {'\0'};
         int rc;
 
         if (argc < 2 || (!strcmp(argv[1],"config") && argc < 3))
@@ -1222,25 +1151,12 @@ static int lfs_catinfo(int argc, char **argv)
         if (strcmp(argv[1], "config") && strcmp(argv[1], "deletions"))
                 return CMD_HELP;
 
-        fp = setmntent(MOUNTED, "r");
-        if (fp == NULL) {
-                 fprintf(stderr, "setmntent(%s): %s:", MOUNTED,
-                         strerror(errno));
-        } else {
-                mnt = getmntent(fp);
-                while (feof(fp) == 0 && ferror(fp) == 0) {
-                        if (llapi_is_lustre_mnt(mnt))
-                                break;
-                        mnt = getmntent(fp);
-                }
-                endmntent(fp);
-        }
-
-        if (mnt) {
+        rc = llapi_search_mounts(NULL, 0, mntdir, NULL);
+        if (rc == 0 && mntdir[0] != '\0') {
                 if (argc == 3)
-                        rc = llapi_catinfo(mnt->mnt_dir, argv[1], argv[2]);
+                        rc = llapi_catinfo(mntdir, argv[1], argv[2]);
                 else
-                        rc = llapi_catinfo(mnt->mnt_dir, argv[1], NULL);
+                        rc = llapi_catinfo(mntdir, argv[1], NULL);
         } else {
                 fprintf(stderr, "no lustre_lite mounted.\n");
                 rc = -1;

diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index 764b59a..4324814 100644 (file)
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -396,11 +396,21 @@ static int print_pool_members(char *fs, char *pool_dir, char *pool_file)
 }
 
 /*
- * search lustre fsname from pathname
+ * search lustre mounts
  *
+ * Calling this function will return to the user the mount point, mntdir, and
+ * the file system name, fsname, if the user passed a buffer to this routine.
+ *
+ * The user inputs are pathname and index. If the pathname is supplied then
+ * the value of the index will be ignored. The pathname will return data if
+ * the pathname is located on a lustre mount. Index is used to pick which
+ * mount point you want in the case of multiple mounted lustre file systems. 
+ * See function lfs_osts in lfs.c for a example of the index use.
  */
-static int search_fsname(char *pathname, char *fsname)
+int llapi_search_mounts(const char *pathname, int index, char *mntdir, 
+                        char *fsname)
 {
+        int len = 0, idx = 0, rc = -ENOENT;
         char *ptr;
         FILE *fp;
         struct mntent *mnt = NULL;
@@ -416,21 +426,37 @@ static int search_fsname(char *pathname, char *fsname)
         mnt = getmntent(fp);
         while ((feof(fp) == 0) && ferror(fp) == 0) {
                 if (llapi_is_lustre_mnt(mnt)) {
+                        int mntlen = strlen(mnt->mnt_dir);
+
+                        ptr = strchr(mnt->mnt_fsname, '/');
+                        if (ptr == NULL && !len) {
+                                rc = -EINVAL;
+                                continue;
+                        }
+
                         /* search by pathname */
-                        if (strncmp(mnt->mnt_dir, pathname,
-                                    strlen(mnt->mnt_dir)) == 0) {
-                                ptr = strchr(mnt->mnt_fsname, '/');
-                                if (ptr == NULL)
-                                        return -EINVAL;
-                                ptr++;
-                                strcpy(fsname, ptr);
-                                return 0;
+                        if (pathname) {
+                                if ((mntlen >= len) && (strncmp(mnt->mnt_dir,
+                                     pathname, mntlen) == 0)) {
+                                        strcpy(mntdir, mnt->mnt_dir);
+                                        if (fsname)
+                                                strcpy(fsname, ++ptr);
+                                        len = mntlen;
+                                        rc = 0;
+                                }
+                        } else if (idx == index) {
+                                strcpy(mntdir, mnt->mnt_dir);
+                                if (fsname)
+                                        strcpy(fsname, ++ptr);
+                                rc = 0;
+                                break;
                         }
+                        idx++;
                 }
                 mnt = getmntent(fp);
         }
         endmntent(fp);
-        return -ENOENT;
+        return rc;
 
 }
 
@@ -446,7 +472,7 @@ static int poolpath(char *fsname, char *pathname, char *pool_pathname)
         char buffer[MAXPATHLEN];
 
         if (fsname == NULL) {
-                rc = search_fsname(pathname, buffer);
+                rc = llapi_search_mounts(pathname, 0, pattern, buffer);
                 if (rc != 0)
                         return rc;
                 fsname = buffer;