diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-12-12 09:51:16 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-12-29 08:29:51 +0100 |
| commit | b3a6ffe16b5cc48abe7db8d04882dc45280eb693 (patch) | |
| tree | 7bd0860ca93beb9aa8c5cb54a3081617d8d12de9 /include/linux | |
| parent | 3c18ce71af754cefae75103dbae28817e04b2db4 (diff) | |
| download | blackbird-op-linux-b3a6ffe16b5cc48abe7db8d04882dc45280eb693.tar.gz blackbird-op-linux-b3a6ffe16b5cc48abe7db8d04882dc45280eb693.zip | |
Get rid of CONFIG_LSF
We have two seperate config entries for large devices/files. One
is CONFIG_LBD that guards just the devices, the other is CONFIG_LSF
that handles large files. This doesn't make a lot of sense, you typically
want both or none. So get rid of CONFIG_LSF and change CONFIG_LBD wording
to indicate that it covers both.
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/types.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index 1d98330b1f2c..121f349cb7ec 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -135,19 +135,14 @@ typedef __s64 int64_t; * * Linux always considers sectors to be 512 bytes long independently * of the devices real block size. + * + * blkcnt_t is the type of the inode's block count. */ #ifdef CONFIG_LBD typedef u64 sector_t; -#else -typedef unsigned long sector_t; -#endif - -/* - * The type of the inode's block count. - */ -#ifdef CONFIG_LSF typedef u64 blkcnt_t; #else +typedef unsigned long sector_t; typedef unsigned long blkcnt_t; #endif |
