Changeset 9147

Timestamp:

12/07/11 16:05:27 (18 months ago)

Author:

k

Message:

mtab/fstab file handling:

- Fix segfault that could be triggered by commenting out lines in tab files
- Allow tab and space as tabfile delimiters (previously only allowed space)
- Support the case in which a fuse mount exists but does not have a static tab entry.

Location:

trunk/src

Files:

• apps/fuse/pvfs2fuse.c (modified) (1 diff)
• common/misc/pvfs2-util.c (modified) (9 diffs)

trunk/src/apps/fuse/pvfs2fuse.c

@@ -1218 +1218 @@
                  config = pvfs2fuse.mntent.pvfs_config_servers[0];
 
-          snprintf( name, 200, "-ofsname=pvfs2fuse#%s", config );
+          snprintf( name, 200, "-ofsname=pvfs2fuse#%s/%s", config, pvfs2fuse.mntent.pvfs_fs_name );
           fuse_opt_insert_arg( &args, 1, name );
 #if (__FreeBSD__ >= 10)

trunk/src/common/misc/pvfs2-util.c

@@ -157 +157 @@
     free(mntent->pvfs_config_servers);
     free(mntent->pvfs_fs_name);
+    mntent->pvfs_fs_name = NULL;
     free(mntent);
     return;
@@ -507 +508 @@
                        !(strncmp(PINT_FSTAB_NAME(tmp_ent), "#", 1)))
                     {
-                        /* this entry is a comment */
                         PINT_fstab_entry_destroy(tmp_ent);
                         continue;
@@ -541 +541 @@
     /* allocate array of entries */
     current_tab = &s_stat_tab_array[s_stat_tab_count];
+
     current_tab->mntent_array = (struct PVFS_sys_mntent *)malloc(
         (tmp_mntent_count * sizeof(struct PVFS_sys_mntent)));
+
     if (!current_tab->mntent_array)
     {
@@ -563 +565 @@
     while ((tmp_ent = PINT_fstab_next_entry(mnt_fp)))
     {
-        if (strcmp(PINT_FSTAB_TYPE(tmp_ent), "pvfs2") == 0)
+       if(!(PINT_FSTAB_NAME(tmp_ent)) || !(strncmp(PINT_FSTAB_NAME(tmp_ent), "#", 1)))
+       {
+           PINT_fstab_entry_destroy(tmp_ent);
+           continue;
+        }
+
+        if ((PINT_FSTAB_TYPE(tmp_ent) != NULL) && (strncmp(PINT_FSTAB_TYPE(tmp_ent), "pvfs2", 5) == 0))
         {
             struct PVFS_sys_mntent *me = &current_tab->mntent_array[i];
             char *cp;
             int cur_server;
-
+            char *rewrite_pointer;
+
+            /* Entries in mtab may be prefixed by a process name and '#' */
+            /* If detected, remove prefix.  */
+            for(rewrite_pointer=cp=PINT_FSTAB_NAME(tmp_ent); *cp; cp++,rewrite_pointer++) {
+                if (*cp == '#') {
+                    rewrite_pointer = PINT_FSTAB_NAME(tmp_ent) - 1;
+                    continue;
+                }
+                if (rewrite_pointer == cp) continue;
+                *rewrite_pointer = *cp;
+            }
+            *rewrite_pointer = '\0';
+               
             /* Enable integrity checks by default */
             me->integrity_check = 1;
@@ -601 +622 @@
             /* parse server list and make sure fsname is same */
             cp = PINT_FSTAB_NAME(tmp_ent);
+
             cur_server = 0;
             for (;;)
@@ -2045 +2067 @@
 
     /* get the path string */
-    nexttok = strtok_r(linestr, " ", &strtok_ctx);
+    nexttok = strtok_r(linestr, " \t", &strtok_ctx);
     if(!nexttok)
     {
@@ -2055 +2077 @@
     /* get the mount point */
 
-    nexttok = strtok_r(NULL, " ", &strtok_ctx);
+    nexttok = strtok_r(NULL, " \t", &strtok_ctx);
     if(!nexttok)
     {
@@ -2063 +2085 @@
 
     /* get the fs type */
-    nexttok = strtok_r(NULL, " ", &strtok_ctx);
+    nexttok = strtok_r(NULL, " \t", &strtok_ctx);
     if(!nexttok)
     {
@@ -2071 +2093 @@
 
     /* get the mount opts */
-    nexttok = strtok_r(NULL, " ", &strtok_ctx);
+    nexttok = strtok_r(NULL, " \t", &strtok_ctx);
     if(!nexttok)
     {