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

[CVS commit program]

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

Modified Files:
      Tag: kunkel-branch
	pvfs2-client-core.c pvfs2-client.c 
Log Message:
Backmerge with HEAD


Index: pvfs2-client-core.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client-core.c,v
diff -p -u -r1.69.2.5 -r1.69.2.6
--- pvfs2-client-core.c	22 Aug 2006 10:54:17 -0000	1.69.2.5
+++ pvfs2-client-core.c	29 Aug 2006 10:41:11 -0000	1.69.2.6
@@ -2166,6 +2166,9 @@ static inline void package_downcall_memb
                             val_sz);
                 }
             }
+            else {
+                PVFS_perror("getxattr: ", *error_code);
+            }
             /* free up the memory allocate to response.geteattr */
             free(vfs_request->response.geteattr.val_array[0].buffer);
             vfs_request->response.geteattr.val_array[0].buffer = NULL;

Index: pvfs2-client.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/apps/kernel/linux/pvfs2-client.c,v
diff -p -u -r1.17.2.4 -r1.17.2.5
--- pvfs2-client.c	21 Aug 2006 09:29:29 -0000	1.17.2.4
+++ pvfs2-client.c	29 Aug 2006 10:41:11 -0000	1.17.2.5
@@ -414,7 +414,7 @@ static void parse_args(int argc, char **
 
     assert(opts);
 
-    while((ret = getopt_long(argc, argv, "hvVfa:p:L:",
+    while((ret = getopt_long(argc, argv, "hvVfa:n:p:L:",
                              long_opts, &option_index)) != -1)
     {
         switch(ret)