[Pvfs2-cvs] commit by slang in pvfs2/src/apps/kernel/linux: mount.pvfs2.c pvfs2-client-core.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/apps/kernel/linux
In directory parlweb1:/tmp/cvs-serv2726/src/apps/kernel/linux

Modified Files:
      Tag: pvfs-2-6-branch
	mount.pvfs2.c pvfs2-client-core.c 
Log Message:
merge recent fixes from HEAD


Index: mount.pvfs2.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/mount.pvfs2.c,v
diff -p -u -r1.3 -r1.3.30.1
--- mount.pvfs2.c	22 May 2006 22:24:51 -0000	1.3
+++ mount.pvfs2.c	5 Apr 2007 15:49:35 -0000	1.3.30.1
@@ -111,6 +111,12 @@ int main(
         myment.mnt_opts = "rw";
     }
 
+    /* if this is just a remount, then exit without touching mtab */
+    if(flags & MS_REMOUNT)
+    {
+        return(0);
+    }
+
     /* Leave mtab alone if it is a link */
     if (lstat(PVFS2_MTAB, &sb) == 0 && S_ISLNK(sb.st_mode))
     {
@@ -191,6 +197,10 @@ static int parse_args(
                 if(!strcmp(index, "ro"))
                 {
                     *flags |= MS_RDONLY;
+                }
+                if(!strcmp(index, "remount"))
+                {
+                    *flags |= MS_REMOUNT;
                 }
                 index = strtok(NULL, ",");
             }

Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.77.6.5 -r1.77.6.6
--- pvfs2-client-core.c	9 Jan 2007 07:21:26 -0000	1.77.6.5
+++ pvfs2-client-core.c	5 Apr 2007 15:49:35 -0000	1.77.6.6
@@ -646,10 +646,10 @@ static PVFS_error post_readdir_request(v
     PVFS_error ret = -PVFS_EINVAL;
 
     gossip_debug(GOSSIP_CLIENTCORE_DEBUG, "Got a readdir request "
-                 "for %llu,%d (token %d)\n",
+                 "for %llu,%d (token %llu)\n",
                  llu(vfs_request->in_upcall.req.readdir.refn.handle),
                  vfs_request->in_upcall.req.readdir.refn.fs_id,
-                 vfs_request->in_upcall.req.readdir.token);
+                 llu(vfs_request->in_upcall.req.readdir.token));
 
     ret = PVFS_isys_readdir(
         vfs_request->in_upcall.req.readdir.refn,
@@ -671,10 +671,10 @@ static PVFS_error post_readdirplus_reque
     PVFS_error ret = -PVFS_EINVAL;
 
     gossip_debug(GOSSIP_CLIENTCORE_DEBUG, "Got a readdirplus request "
-                 "for %llu,%d (token %d)\n",
+                 "for %llu,%d (token %llu)\n",
                  llu(vfs_request->in_upcall.req.readdirplus.refn.handle),
                  vfs_request->in_upcall.req.readdirplus.refn.fs_id,
-                 vfs_request->in_upcall.req.readdirplus.token);
+                 llu(vfs_request->in_upcall.req.readdirplus.token));
 
     ret = PVFS_isys_readdirplus(
         vfs_request->in_upcall.req.readdirplus.refn,
@@ -2337,6 +2337,7 @@ static inline void package_downcall_memb
             }
 
             PVFS_util_free_mntent(vfs_request->mntent);
+            free(vfs_request->mntent);
 
             break;
         case PVFS2_VFS_OP_RENAME:
@@ -2434,7 +2435,11 @@ static inline void package_downcall_memb
             /* replace non-errno error code to avoid passing to kernel */
             if (*error_code == -PVFS_ECANCEL)
             {
-                *error_code = -PVFS_EINTR;
+                /* if an ECANCEL shows up here without going through the 
+                 * cancel_op_in_progress() path, then -PVFS_ETIMEDOUT is 
+                 * a better errno approximation than -PVFS_EINTR 
+                 */
+                *error_code = -PVFS_ETIMEDOUT;
             }
             break;
         case PVFS2_VFS_OP_FILE_IOX:
@@ -2464,7 +2469,11 @@ static inline void package_downcall_memb
             /* replace non-errno error code to avoid passing to kernel */
             if (*error_code == -PVFS_ECANCEL)
             {
-                *error_code = -PVFS_EINTR;
+                /* if an ECANCEL shows up here without going through the 
+                 * cancel_op_in_progress() path, then -PVFS_ETIMEDOUT is 
+                 * a better errno approximation than -PVFS_EINTR 
+                 */
+                *error_code = -PVFS_ETIMEDOUT;
             }
             break;
         }