[Pvfs2-cvs] commit by robl in pvfs2-1/src/kernel/linux-2.6: inode.c pvfs2-utils.c

[CVS commit program]

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

Modified Files:
	inode.c pvfs2-utils.c 
Log Message:
Ok, this gets us compiling again, but is almost assuredly not the correct way
to deal with the removal of i_blksize


Index: inode.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/inode.c,v
diff -u -w -p -u -r1.75 -r1.76
--- inode.c	26 Sep 2006 03:44:17 -0000	1.75
+++ inode.c	20 Oct 2006 19:02:36 -0000	1.76
@@ -488,7 +488,9 @@ struct inode *pvfs2_get_custom_inode(
         inode->i_gid = current->fsgid;
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
         inode->i_size = PAGE_CACHE_SIZE;
+#ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE
         inode->i_blksize = PAGE_CACHE_SIZE;
+#endif
         inode->i_blkbits = PAGE_CACHE_SHIFT;
         inode->i_blocks = 0;
         inode->i_rdev = dev;
@@ -508,7 +510,9 @@ struct inode *pvfs2_get_custom_inode(
 	    inode->i_op = &pvfs2_file_inode_operations;
 	    inode->i_fop = &pvfs2_file_operations;
 
+#ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE
             inode->i_blksize = pvfs_bufmap_size_query();
+#endif
             inode->i_blkbits = PAGE_CACHE_SHIFT;
         }
         else if ((mode & S_IFMT) == S_IFLNK)

Index: pvfs2-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-utils.c,v
diff -u -w -p -u -r1.142 -r1.143
--- pvfs2-utils.c	10 Oct 2006 16:36:56 -0000	1.142
+++ pvfs2-utils.c	20 Oct 2006 19:02:36 -0000	1.143
@@ -145,7 +145,9 @@ int copy_attributes_to_inode(
           changing the inode->i_blkbits to something other than
           PAGE_CACHE_SHIFT breaks mmap/execution as we depend on that.
         */
+#ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE
         inode->i_blksize = pvfs_bufmap_size_query();
+#endif
         inode->i_blkbits = PAGE_CACHE_SHIFT;
         gossip_debug(GOSSIP_UTILS_DEBUG, "attrs->mask = %x (objtype = %s)\n", 
                 attrs->mask,