[Pvfs2-cvs] commit by slang in pvfs2/src/apps/admin: pvfs2-ls.c

CVS commit program cvs at parl.clemson.edu
Fri Jan 12 21:33:21 EST 2007


Update of /projects/cvsroot/pvfs2/src/apps/admin
In directory parlweb1:/tmp/cvs-serv22376/src/apps/admin

Modified Files:
      Tag: pvfs-2-6-branch
	pvfs2-ls.c 
Log Message:
fix pvfs2-ls to abort if the first getattr fails.


Index: pvfs2-ls.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/admin/pvfs2-ls.c,v
diff -p -u -r1.68 -r1.68.6.1
--- pvfs2-ls.c	23 Oct 2006 15:23:18 -0000	1.68
+++ pvfs2-ls.c	13 Jan 2007 02:33:21 -0000	1.68.6.1
@@ -424,8 +424,9 @@ int do_list(
     pvfs_dirent_incount = MAX_NUM_DIRENTS;
 
     memset(&getattr_response,0,sizeof(PVFS_sysresp_getattr));
-    if (PVFS_sys_getattr(ref, PVFS_ATTR_SYS_ALL_NOHINT,
-                         &credentials, &getattr_response) == 0)
+    ret = PVFS_sys_getattr(ref, PVFS_ATTR_SYS_ALL_NOHINT,
+                           &credentials, &getattr_response);
+    if(ret == 0)
     {
         if ((getattr_response.attr.objtype == PVFS_TYPE_METAFILE) ||
             (getattr_response.attr.objtype == PVFS_TYPE_SYMLINK) ||
@@ -461,6 +462,11 @@ int do_list(
             }
             return 0;
         }
+    }
+    else
+    {
+        PVFS_perror("PVFS_sys_getattr", ret);
+        return -1;
     }
 
     if (do_timing)



More information about the Pvfs2-cvs mailing list