lkml.org 
[lkml]   [2006]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC][Update][Patch 15/16] compile warning fix and change 64bit to INCOMPAT feature
    From
    Date
    Change the 64bit to INCOMPAT feature, and fixed compile warning in the 64bit_metadata patch.

    Signed-off-by: Mingming Cao <cmm@us.ibm.com>


    ---

    linux-2.6.17-ming/include/linux/ext3_fs.h | 15 ++++++++-------
    1 files changed, 8 insertions(+), 7 deletions(-)

    diff -puN include/linux/ext3_fs.h~64bit-incompat-flag-change include/linux/ext3_fs.h
    --- linux-2.6.17/include/linux/ext3_fs.h~64bit-incompat-flag-change 2006-06-28 16:47:16.224709734 -0700
    +++ linux-2.6.17-ming/include/linux/ext3_fs.h 2006-06-28 16:49:17.471797610 -0700
    @@ -136,6 +136,9 @@ struct ext3_group_desc
    __le32 bg_reserved[3];
    };

    +#ifdef __KERNEL__
    +#include <linux/ext3_fs_i.h>
    +#include <linux/ext3_fs_sb.h>
    static inline u32 EXT3_RELATIVE_ENCODE(ext3_fsblk_t group_base,
    ext3_fsblk_t fs_block)
    {
    @@ -183,7 +186,7 @@ static inline ext3_fsblk_t EXT3_RELATIVE
    ((bg)->bg_inode_bitmap != 0)
    #define EXT3_IS_USED_INODE_TABLE(bg) \
    ((bg)->bg_inode_table != 0)
    -
    +#endif
    /*
    * Macro-instructions used to manage group descriptors
    */
    @@ -564,8 +567,6 @@ struct ext3_super_block {
    } while (0)

    #ifdef __KERNEL__
    -#include <linux/ext3_fs_i.h>
    -#include <linux/ext3_fs_sb.h>
    static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb)
    {
    return sb->s_fs_info;
    @@ -636,7 +637,6 @@ static inline struct ext3_inode_info *EX
    #define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
    #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
    #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
    -#define EXT3_FEATURE_RO_COMPAT_64BIT 0x0010

    #define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
    #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
    @@ -644,16 +644,17 @@ static inline struct ext3_inode_info *EX
    #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
    #define EXT3_FEATURE_INCOMPAT_META_BG 0x0010
    #define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
    +#define EXT3_FEATURE_INCOMPAT_64BIT 0x0080

    #define EXT3_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
    #define EXT3_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_FILETYPE| \
    EXT3_FEATURE_INCOMPAT_RECOVER| \
    EXT3_FEATURE_INCOMPAT_META_BG| \
    - EXT3_FEATURE_INCOMPAT_EXTENTS)
    + EXT3_FEATURE_INCOMPAT_EXTENTS| \
    + EXT3_FEATURE_INCOMPAT_64BIT)
    #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
    EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
    - EXT3_FEATURE_RO_COMPAT_BTREE_DIR| \
    - EXT3_FEATURE_RO_COMPAT_64BIT)
    + EXT3_FEATURE_RO_COMPAT_BTREE_DIR)

    /*
    * Default values for user and/or group using reserved blocks
    _


    -
    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-06-30 02:23    [W:4.168 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site