[PVFS2-CVS] commit by neill in pvfs2-1/src/kernel/linux-2.6: devpvfs2-req.c pvfs2-kernel.h pvfs2-utils.c

[CVS commit program]

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

Modified Files:
	devpvfs2-req.c pvfs2-kernel.h pvfs2-utils.c 
Log Message:
- misc cleanups
- i_size_write usage adjustments
- another ino to handle adjustment


Index: devpvfs2-req.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/devpvfs2-req.c,v
diff -p -u -r1.19 -r1.20
--- devpvfs2-req.c	13 Jan 2004 14:43:26 -0000	1.19
+++ devpvfs2-req.c	5 Feb 2004 16:55:37 -0000	1.20
@@ -384,7 +384,8 @@ static int pvfs2_devreq_ioctl(
     return -ENOSYS;
 }
 
-struct file_operations pvfs2_devreq_file_operations = {
+struct file_operations pvfs2_devreq_file_operations =
+{
     .read = pvfs2_devreq_read,
     .writev = pvfs2_devreq_writev,
     .open = pvfs2_devreq_open,

Index: pvfs2-kernel.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-kernel.h,v
diff -p -u -r1.29 -r1.30
--- pvfs2-kernel.h	26 Jan 2004 18:55:56 -0000	1.29
+++ pvfs2-kernel.h	5 Feb 2004 16:55:37 -0000	1.30
@@ -68,7 +68,7 @@ sizeof(int64_t) + sizeof(pvfs2_downcall_
 /* translates a pvfs2 handle to an inode number */
 #define pvfs2_handle_to_ino(handle) (ino_t)pvfs2_handle_l32(handle)
 
-#define pvfs2_handle_l32(handle) (__u32)(handle & 0x00000000FFFFFFFF)
+#define pvfs2_handle_l32(handle) (__u32)(handle)
 #define pvfs2_handle_h32(handle) (__u32)(handle >> 32)
 
 /************************************

Index: pvfs2-utils.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-utils.c,v
diff -p -u -r1.44 -r1.45
--- pvfs2-utils.c	26 Jan 2004 17:04:23 -0000	1.44
+++ pvfs2-utils.c	5 Feb 2004 16:55:37 -0000	1.45
@@ -97,7 +97,12 @@ static inline int copy_attributes_to_ino
             inode->i_blocks = (unsigned long)(rounded_up_size / 512);
             spin_unlock(&inode->i_lock);
 
-            i_size_write(inode, inode_size);
+            /*
+              NOTE: make sure all the places we're called from have
+              the inode->i_sem lock.  we're fine in 99% of the cases
+              since we're mostly called from a lookup.
+            */
+            inode->i_size = inode_size;
         }
         else if ((attrs->objtype == PVFS_TYPE_SYMLINK) &&
                  (symname != NULL))