lkml.org 
[lkml]   [2009]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 56/60] ext4: Ignore i_file_acl_high unless EXT4_FEATURE_INCOMPAT_64BIT is present
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: "Theodore Ts'o" <tytso@mit.edu>

    (cherry picked from commit a9e817425dc0baede8ebe5fbc9984a640257432b)

    Don't try to look at i_file_acl_high unless the INCOMPAT_64BIT feature
    bit is set. The field is normally zero, but older versions of e2fsck
    didn't automatically check to make sure of this, so in the spirit of
    "be liberal in what you accept", don't look at i_file_acl_high unless
    we are using a 64-bit filesystem.

    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/ext4/inode.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- a/fs/ext4/inode.c
    +++ b/fs/ext4/inode.c
    @@ -4064,11 +4064,9 @@ struct inode *ext4_iget(struct super_blo
    ei->i_flags = le32_to_cpu(raw_inode->i_flags);
    inode->i_blocks = ext4_inode_blocks(raw_inode, ei);
    ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
    - if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
    - cpu_to_le32(EXT4_OS_HURD)) {
    + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT))
    ei->i_file_acl |=
    ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;
    - }
    inode->i_size = ext4_isize(raw_inode);
    ei->i_disksize = inode->i_size;
    inode->i_generation = le32_to_cpu(raw_inode->i_generation);



    \
     
     \ /
      Last update: 2009-06-10 06:03    [W:2.631 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site