lkml.org 
[lkml]   [2006]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Centralise definitions of sector_t and blkcnt_t
    Date
    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.

    Signed-off-by: Matthew Wilcox <matthew@wil.cx>
    ---
    block/Kconfig | 6 ++----
    include/asm-h8300/types.h | 6 ------
    include/asm-i386/types.h | 10 ----------
    include/asm-mips/types.h | 10 ----------
    include/asm-powerpc/types.h | 10 ----------
    include/asm-s390/types.h | 10 ----------
    include/asm-sh/types.h | 10 ----------
    include/asm-x86_64/types.h | 3 ---
    include/linux/types.h | 14 +++++++++-----
    9 files changed, 11 insertions(+), 68 deletions(-)

    diff --git a/block/Kconfig b/block/Kconfig
    index 83766a6..a50f481 100644
    --- a/block/Kconfig
    +++ b/block/Kconfig
    @@ -19,11 +19,9 @@ config BLOCK

    if BLOCK

    -#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
    @@ -44,7 +42,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.
    diff --git a/include/asm-h8300/types.h b/include/asm-h8300/types.h
    index da2402b..2a8b1b2 100644
    --- a/include/asm-h8300/types.h
    +++ b/include/asm-h8300/types.h
    @@ -55,12 +55,6 @@ #define BITS_PER_LONG 32

    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__ */
    diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
    index 4b4b295..ad0a55b 100644
    --- a/include/asm-i386/types.h
    +++ b/include/asm-i386/types.h
    @@ -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__ */
    diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
    index 2b52e18..63a13c5 100644
    --- a/include/asm-mips/types.h
    +++ b/include/asm-mips/types.h
    @@ -93,16 +93,6 @@ #else
    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__ */
    diff --git a/include/asm-powerpc/types.h b/include/asm-powerpc/types.h
    index d6fb56b..3b36375 100644
    --- a/include/asm-powerpc/types.h
    +++ b/include/asm-powerpc/types.h
    @@ -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__ */
    diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
    index ae2951c..fc5d7cf 100644
    --- a/include/asm-s390/types.h
    +++ b/include/asm-s390/types.h
    @@ -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__ */
    diff --git a/include/asm-sh/types.h b/include/asm-sh/types.h
    index 3c09dd4..fd00dbb 100644
    --- a/include/asm-sh/types.h
    +++ b/include/asm-sh/types.h
    @@ -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__ */
    diff --git a/include/asm-x86_64/types.h b/include/asm-x86_64/types.h
    index c86c2e6..2d4491a 100644
    --- a/include/asm-x86_64/types.h
    +++ b/include/asm-x86_64/types.h
    @@ -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__ */
    diff --git a/include/linux/types.h b/include/linux/types.h
    index 750f085..c0fa603 100644
    --- a/include/linux/types.h
    +++ b/include/linux/types.h
    @@ -134,15 +134,19 @@ #define aligned_u64 unsigned long long _
    *
    * 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

    --
    1.4.1.1
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-10-05 19:09    [W:3.900 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site