Handle CONFIG_LBD and CONFIG_LSF in one place
PATCH 1/1 Handle CONFIG_LBD and CONFIG_LSF in one place
CONFIG_LBD and CONFIG_LSF are spread into asm/types.h for no particularly good reason. Centralising the definition in linux/types.h means that arch maintainers don't need to bother adding it, as well as fixing the problem with x86-64 users being asked to make a decision that has absolutely no effect. The H8/300 porters seem particularly confused since I'm not aware of any microcontrollers that need to support 2TB filesystems these days.
Index: ./block/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.6/block/Kconfig,v
retrieving revision 1.4
block/Kconfig +2 -4
@@ -1,11 +1,9 @@ # # Block layer core configuration # -#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64 -#for instance. config LBD bool "Support for Large Block Devices" - depends on X86 || (MIPS && 32BIT) || PPC32 || (S390 && !64BIT) || SUPERH || UML + depends on !64BIT help Say Y here if you want to attach large (bigger than 2TB) discs to your machine, or if you want to have a raid or loopback device
@@ -26,7 +24,7 @@ config BLK_DEV_IO_TRACE config LSF bool "Support for Large Single Files" - depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML + depends on !64BIT help Say Y here if you want to be able to handle very large files (bigger than 2TB), otherwise say N.
Index: ./include/asm-h8300/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-h8300/types.h,v retrieving revision 1.5
include/asm-h8300/types.h +0 -6
@@ -55,12 +55,6 @@ typedef unsigned long long u64;typedef u32 dma_addr_t ; -#define HAVE_SECTOR_T -typedef u64 sector_t ; - -#define HAVE_BLKCNT_T -typedef u64 blkcnt_t ; -#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */
Index: ./include/asm-i386/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-i386/types.h,v retrieving revision 1.4
include/asm-i386/types.h +0 -10
@@ -58,16 +58,6 @@ typedef u32 dma_addr_t;#endif typedef u64 dma64_addr_t ; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-mips/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-mips/types.h,v retrieving revision 1.6
include/asm-mips/types.h +0 -10
@@ -94,16 +94,6 @@ typedef unsigned long long phys_t;typedef unsigned long phys_t ;#endif -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-powerpc/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-powerpc/types.h,v retrieving revision 1.3
include/asm-powerpc/types.h +0 -10
@@ -98,16 +98,6 @@ typedef struct {unsigned long env; } func_descr_t; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-s390/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-s390/types.h,v retrieving revision 1.6
include/asm-s390/types.h +0 -10
@@ -88,16 +88,6 @@ typedef union { } subreg; } register_pair; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* ! __s390x__ */ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-sh/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-sh/types.h,v retrieving revision 1.5
include/asm-sh/types.h +0 -10
@@ -53,16 +53,6 @@ typedef unsigned long long u64;typedef u32 dma_addr_t ; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/linux/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/linux/types.h,v retrieving revision 1.11
include/linux/types.h +9 -4
@@ -130,14 +130,19 @@ typedef __s64 int64_t;/* * The type used for indexing onto a disc or disc partition. -* If required, asm/types.h can override it and define -* HAVE_SECTOR_T */ -#ifndef HAVE_SECTOR_T +#ifdef CONFIG_LBD +typedef u64 sector_t ; +#else typedef unsigned long sector_t ;#endif -#ifndef HAVE_BLKCNT_T +/* +* The type of the inode's block count. +*/ +#ifdef CONFIG_LSF +typedef u64 blkcnt_t ; +#else typedef unsigned long blkcnt_t ;#endif
Quoted 7 lines · Matthew Wilcox
CONFIG_LBDandCONFIG_LSFare spread intoasm/types.hfor no particularly good reason. Centralising the definition inlinux/types.hmeans that arch maintainers don't need to bother adding it, as well as fixing the problem with x86-64 users being asked to make a decision that has absolutely no effect. The H8/300 porters seem particularly confused since I'm not aware of any microcontrollers that need to support 2TB filesystems these days.
x86_64:
include/linux/types.h:137: error: conflicting types for 'sector_t' include/asm/types.h:51: error: previous declaration of 'sector_t' was here
Quoted 9 lines · Andrew Morton
Quoted 7 lines · Matthew Wilcox
CONFIG_LBDandCONFIG_LSFare spread intoasm/types.hfor no particularly good reason. Centralising the definition inlinux/types.hmeans that arch maintainers don't need to bother adding it, as well as fixing the problem with x86-64 users being asked to make a decision that has absolutely no effect. The H8/300 porters seem particularly confused since I'm not aware of any microcontrollers that need to support 2TB filesystems these days.
Quoted 4 lines
x86_64:
include/linux/types.h:137: error: conflicting types for 'sector_t'include/asm/types.h:51: error: previous declaration of 'sector_t' was here
is the conflicting patch available somewhere so i can put a patch in for it? basically, you just need to delete the typedefs for sector_t and blkcnt_t, just like i've done for the other architectures.
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Andrew Morton
Quoted 7 lines · Matthew Wilcox
CONFIG_LBDandCONFIG_LSFare spread intoasm/types.hfor no particularly good reason. Centralising the definition inlinux/types.hmeans that arch maintainers don't need to bother adding it, as well as fixing the problem with x86-64 users being asked to make a decision that has absolutely no effect. The H8/300 porters seem particularly confused since I'm not aware of any microcontrollers that need to support 2TB filesystems these days.
Quoted 7 lines
Quoted 4 lines
x86_64:
include/linux/types.h:137: error: conflicting types for 'sector_t'include/asm/types.h:51: error: previous declaration of 'sector_t' was hereis the conflicting patch available somewhere so i can put a patch in for it?
I don't think there was any conflicting patch. I have no other patches touching include/linux/types.h or include/asm-x86_64/types.h.
Quoted 5 lines · Andrew Morton
Quoted 2 lines
is the conflicting patch available somewhere so i can put a patch in for it?
I don't think there was any conflicting patch. I have no other patches touching
include/linux/types.horinclude/asm-x86_64/types.h.
hm. weird. looks like i overlooked something somehow. i swear i grepped for it.
Updated patch:
CONFIG_LBD and CONFIG_LSF are spread into asm/types.h for no particularly good reason. Centralising the definition in linux/types.h means that arch maintainers don't need to bother adding it, as well as fixing the problem with x86-64 users being asked to make a decision that has absolutely no effect. The H8/300 porters seem particularly confused since I'm not aware of any microcontrollers that need to support 2TB filesystems these days.
Index: ./block/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.6/block/Kconfig,v
retrieving revision 1.4
block/Kconfig +2 -4
@@ -1,11 +1,9 @@ # # Block layer core configuration # -#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64 -#for instance. config LBD bool "Support for Large Block Devices" - depends on X86 || (MIPS && 32BIT) || PPC32 || (S390 && !64BIT) || SUPERH || UML + depends on !64BIT help Say Y here if you want to attach large (bigger than 2TB) discs to your machine, or if you want to have a raid or loopback device
@@ -26,7 +24,7 @@ config BLK_DEV_IO_TRACE config LSF bool "Support for Large Single Files" - depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML + depends on !64BIT help Say Y here if you want to be able to handle very large files (bigger than 2TB), otherwise say N.
Index: ./include/asm-h8300/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-h8300/types.h,v retrieving revision 1.5
include/asm-h8300/types.h +0 -6
@@ -55,12 +55,6 @@ typedef unsigned long long u64;typedef u32 dma_addr_t ; -#define HAVE_SECTOR_T -typedef u64 sector_t ; - -#define HAVE_BLKCNT_T -typedef u64 blkcnt_t ; -#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */
Index: ./include/asm-i386/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-i386/types.h,v retrieving revision 1.4
include/asm-i386/types.h +0 -10
@@ -58,16 +58,6 @@ typedef u32 dma_addr_t;#endif typedef u64 dma64_addr_t ; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-mips/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-mips/types.h,v retrieving revision 1.6
include/asm-mips/types.h +0 -10
@@ -94,16 +94,6 @@ typedef unsigned long long phys_t;typedef unsigned long phys_t ;#endif -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-powerpc/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-powerpc/types.h,v retrieving revision 1.3
include/asm-powerpc/types.h +0 -10
@@ -98,16 +98,6 @@ typedef struct {unsigned long env; } func_descr_t; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-s390/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-s390/types.h,v retrieving revision 1.6
include/asm-s390/types.h +0 -10
@@ -88,16 +88,6 @@ typedef union { } subreg; } register_pair; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* ! __s390x__ */ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-sh/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-sh/types.h,v retrieving revision 1.5
include/asm-sh/types.h +0 -10
@@ -53,16 +53,6 @@ typedef unsigned long long u64;typedef u32 dma_addr_t ; -#ifdef CONFIG_LBD -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif - -#ifdef CONFIG_LSF -typedef u64 blkcnt_t ; -#define HAVE_BLKCNT_T -#endif -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/asm-x86_64/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-x86_64/types.h,v retrieving revision 1.5
include/asm-x86_64/types.h +0 -3
@@ -48,9 +48,6 @@ typedef unsigned long long u64;typedef u64 dma64_addr_t ;typedef u64 dma_addr_t ; -typedef u64 sector_t ; -#define HAVE_SECTOR_T -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
Index: ./include/linux/types.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/linux/types.h,v retrieving revision 1.11
include/linux/types.h +9 -4
@@ -130,14 +130,19 @@ typedef __s64 int64_t;/* * The type used for indexing onto a disc or disc partition. -* If required, asm/types.h can override it and define -* HAVE_SECTOR_T */ -#ifndef HAVE_SECTOR_T +#ifdef CONFIG_LBD +typedef u64 sector_t ; +#else typedef unsigned long sector_t ;#endif -#ifndef HAVE_BLKCNT_T +/* +* The type of the inode's block count. +*/ +#ifdef CONFIG_LSF +typedef u64 blkcnt_t ; +#else typedef unsigned long blkcnt_t ;#endif