[Pvfs2-cvs] commit by pcarns in pvfs2-1/src/kernel/linux-2.6: pvfs2-kernel.h super.c

[CVS commit program]

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

Modified Files:
	pvfs2-kernel.h super.c 
Log Message:
PVFS does not have any size limits except for the maximum value of
a 64 bit integer, so don't use the standard MAX_LFS_FILESIZE limit.
Confirmed that this allows us to seek and write 64 TB files on BG/P.  We'll
leave it up to the VFS/VM to enforce any OS level limits on file size.


Index: pvfs2-kernel.h
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/pvfs2-kernel.h,v
diff -p -u -r1.154 -r1.155
--- pvfs2-kernel.h	8 Aug 2008 15:06:13 -0000	1.154
+++ pvfs2-kernel.h	24 Sep 2008 18:12:27 -0000	1.155
@@ -115,15 +115,6 @@ typedef unsigned long sector_t;
 #include <linux/exportfs.h>
 #endif
 
-/* taken from include/linux/fs.h from 2.4.19 or later kernels */
-#ifndef MAX_LFS_FILESIZE
-#if BITS_PER_LONG == 32
-#define MAX_LFS_FILESIZE     (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG))-1)
-#elif BITS_PER_LONG == 64
-#define MAX_LFS_FILESIZE     0x7fffffffffffffff
-#endif
-#endif /* MAX_LFS_FILESIZE */
-
 #include "pint-dev-shared.h"
 #include "pvfs2-dev-proto.h"
 #include "pvfs2-types.h"

Index: super.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/kernel/linux-2.6/super.c,v
diff -p -u -r1.104 -r1.105
--- super.c	4 Aug 2008 17:58:23 -0000	1.104
+++ super.c	24 Sep 2008 18:12:27 -0000	1.105
@@ -974,7 +974,7 @@ struct super_block* pvfs2_get_sb(
 
     sb->s_blocksize = pvfs_bufmap_size_query();
     sb->s_blocksize_bits = pvfs_bufmap_shift_query();
-    sb->s_maxbytes = MAX_LFS_FILESIZE;
+    sb->s_maxbytes = (unsigned long long) 1 << 63;
 
     root_object.handle = PVFS2_SB(sb)->root_handle;
     root_object.fs_id  = PVFS2_SB(sb)->fs_id;
@@ -1199,7 +1199,7 @@ int pvfs2_fill_sb(
 
     sb->s_blocksize = pvfs_bufmap_size_query();
     sb->s_blocksize_bits = pvfs_bufmap_shift_query();
-    sb->s_maxbytes = MAX_LFS_FILESIZE;
+    sb->s_maxbytes = (unsigned long long) 1 << 63;
 
     root_object.handle = PVFS2_SB(sb)->root_handle;
     root_object.fs_id  = PVFS2_SB(sb)->fs_id;