You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] Centralise definitions of sector_t and blkcnt_t
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. Signed-off-by: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
2d941e99df
commit
e62438630c
@@ -57,11 +57,6 @@ typedef unsigned long long u64;
|
||||
|
||||
typedef u32 dma_addr_t;
|
||||
|
||||
#ifdef CONFIG_LBD
|
||||
typedef u64 sector_t;
|
||||
#define HAVE_SECTOR_T
|
||||
#endif
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
@@ -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__ */
|
||||
|
||||
@@ -57,16 +57,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__ */
|
||||
|
||||
@@ -93,16 +93,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__ */
|
||||
|
||||
@@ -97,16 +97,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__ */
|
||||
|
||||
@@ -87,16 +87,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__ */
|
||||
|
||||
@@ -52,16 +52,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__ */
|
||||
|
||||
@@ -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__ */
|
||||
|
||||
@@ -136,15 +136,19 @@ typedef __s64 int64_t;
|
||||
*
|
||||
* Linux always considers sectors to be 512 bytes long independently
|
||||
* of the devices real block size.
|
||||
*
|
||||
* 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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user