[Pvfs2-cvs] commit by bligon in pvfs2/src/kernel/linux-2.6: dir.c pvfs2-dev-proto.h

[CVS commit program]

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

Modified Files:
      Tag: Orange-FailOver-Becky
	dir.c pvfs2-dev-proto.h 
Log Message:
Completed changes to PVFS_object_attr.  Changes to get-attr.sm are still underday


Index: dir.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/dir.c,v
diff -p -u -r1.58 -r1.58.20.1
--- dir.c	8 Dec 2008 15:54:56 -0000	1.58
+++ dir.c	10 Jul 2009 21:16:19 -0000	1.58.20.1
@@ -201,7 +201,7 @@ static int pvfs2_readdir(
 	    new_op->upcall.req.readdir.refn.fs_id =
 		PVFS2_SB(dentry->d_inode->i_sb)->fs_id;
 	}
-	new_op->upcall.req.readdir.max_dirent_count = MAX_DIRENT_COUNT;
+	new_op->upcall.req.readdir.max_dirent_count = MAX_DIRENT_COUNT_READDIR;
 
 	/* NOTE:
 	   the position we send to the readdir upcall is out of
@@ -629,7 +629,8 @@ static int pvfs2_readdirplus_common(
             else
             {
 #if defined(HAVE_IGET5_LOCKED) || defined(HAVE_IGET4_LOCKED)
-                gossip_lerr("Critical error: i_ino cannot be relied on when using iget4/5\n");
+                gossip_lerr("Critical error: i_ino cannot be relied on "
+                            "when using iget4/5\n");
                 op_release(new_op);
                 return -EINVAL;
 #endif
@@ -639,7 +640,8 @@ static int pvfs2_readdirplus_common(
                     PVFS2_SB(dentry->d_inode->i_sb)->fs_id;
             }
             new_op->upcall.req.readdirplus.mask = pvfs2_mask;
-            new_op->upcall.req.readdirplus.max_dirent_count = MAX_DIRENT_COUNT;
+            new_op->upcall.req.readdirplus.max_dirent_count 
+                    = MAX_DIRENT_COUNT_READDIRPLUS;
 
             /* NOTE:
                the position we send to the readdirplus upcall is out of
@@ -652,7 +654,8 @@ static int pvfs2_readdirplus_common(
             ret = readdir_index_get(&buffer_index);
             if (ret < 0)
             {
-                gossip_err("pvfs2_readdirplus: readdir_index_get() failure (%d)\n", ret);
+                gossip_err("pvfs2_readdirplus: readdir_index_get() "
+                           "failure (%d)\n", ret);
                 goto err;
             }
             new_op->upcall.req.readdirplus.buf_index = buffer_index;

Index: pvfs2-dev-proto.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/pvfs2-dev-proto.h,v
diff -p -u -r1.21 -r1.21.20.1
--- pvfs2-dev-proto.h	15 Oct 2008 14:37:38 -0000	1.21
+++ pvfs2-dev-proto.h	10 Jul 2009 21:16:19 -0000	1.21.20.1
@@ -47,8 +47,16 @@
  * Otherwise 32-64 bit interactions will be messed up :)
  */
 #define PVFS2_NAME_LEN                 0x00000100
-/* MAX_DIRENT_COUNT cannot be larger than PVFS_REQ_LIMIT_LISTATTR */
-#define MAX_DIRENT_COUNT               0x00000060
+
+/* MAX_DIRENT_COUNT cannot be larger than PVFS_REQ_LIMIT_LISTATTR.
+ * The value of PVFS_REQ_LIMIT_LISTATTR has been changed from 113 to 60 
+ * to accomodate an attribute object with mirrored handles.             
+ * MAX_DIRENT_COUNT is replaced by MAX_DIRENT_COUNT_READDIR and 
+ * MAX_DIRENT_COUNT_READDIRPLUS, since readdir doesn't trigger a listattr
+ * but readdirplus might.
+*/
+#define MAX_DIRENT_COUNT_READDIR       0x00000060
+#define MAX_DIRENT_COUNT_READDIRPLUS   0x0000003C
 
 #include "pvfs2.h"