Commit a0f62ac6 authored by Takashi Sato's avatar Takashi Sato Committed by Linus Torvalds

[PATCH] 2TB files: add blkcnt_t

Add blkcnt_t as the type of inode.i_blocks.  This enables you to make the size
of blkcnt_t either 4 bytes or 8 bytes on 32 bits architecture with CONFIG_LSF.

- CONFIG_LSF
  Add new configuration parameter.
- blkcnt_t
  On h8300, i386, mips, powerpc, s390 and sh that define sector_t,
  blkcnt_t is defined as u64 if CONFIG_LSF is enabled; otherwise it is
  defined as unsigned long.
  On other architectures, it is defined as unsigned long.
- inode.i_blocks
  Change the type from sector_t to blkcnt_t.
Signed-off-by: default avatarTakashi Sato <sho@tnes.nec.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent abcb6c9f
...@@ -23,4 +23,13 @@ config BLK_DEV_IO_TRACE ...@@ -23,4 +23,13 @@ config BLK_DEV_IO_TRACE
git://brick.kernel.dk/data/git/blktrace.git git://brick.kernel.dk/data/git/blktrace.git
config LSF
bool "Support for Large Single Files"
depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
default n
help
When CONFIG_LBD is disabled, say Y here if you want to
handle large file(bigger than 2TB), otherwise say N.
When CONFIG_LBD is enabled, Y is set automatically.
source block/Kconfig.iosched source block/Kconfig.iosched
...@@ -58,6 +58,9 @@ typedef u32 dma_addr_t; ...@@ -58,6 +58,9 @@ typedef u32 dma_addr_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
typedef u64 sector_t; typedef u64 sector_t;
#define HAVE_BLKCNT_T
typedef u64 blkcnt_t;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -63,6 +63,11 @@ typedef u64 sector_t; ...@@ -63,6 +63,11 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
#ifdef CONFIG_LSF
typedef u64 blkcnt_t;
#define HAVE_BLKCNT_T
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -99,6 +99,11 @@ typedef u64 sector_t; ...@@ -99,6 +99,11 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
#ifdef CONFIG_LSF
typedef u64 blkcnt_t;
#define HAVE_BLKCNT_T
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -103,6 +103,11 @@ typedef u64 sector_t; ...@@ -103,6 +103,11 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
#ifdef CONFIG_LSF
typedef u64 blkcnt_t;
#define HAVE_BLKCNT_T
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -93,6 +93,11 @@ typedef u64 sector_t; ...@@ -93,6 +93,11 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
#ifdef CONFIG_LSF
typedef u64 blkcnt_t;
#define HAVE_BLKCNT_T
#endif
#endif /* ! __s390x__ */ #endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -58,6 +58,11 @@ typedef u64 sector_t; ...@@ -58,6 +58,11 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
#ifdef CONFIG_LSF
typedef u64 blkcnt_t;
#define HAVE_BLKCNT_T
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -490,7 +490,7 @@ struct inode { ...@@ -490,7 +490,7 @@ struct inode {
unsigned int i_blkbits; unsigned int i_blkbits;
unsigned long i_blksize; unsigned long i_blksize;
unsigned long i_version; unsigned long i_version;
sector_t i_blocks; blkcnt_t i_blocks;
unsigned short i_bytes; unsigned short i_bytes;
spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */
struct mutex i_mutex; struct mutex i_mutex;
......
...@@ -137,6 +137,10 @@ typedef __s64 int64_t; ...@@ -137,6 +137,10 @@ typedef __s64 int64_t;
typedef unsigned long sector_t; typedef unsigned long sector_t;
#endif #endif
#ifndef HAVE_BLKCNT_T
typedef unsigned long blkcnt_t;
#endif
/* /*
* The type of an index into the pagecache. Use a #define so asm/types.h * The type of an index into the pagecache. Use a #define so asm/types.h
* can override it. * can override it.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment