ext4-rename-i_file_acl-to-i_file_acl_lo.patch

   1 ext4: Rename i_file_acl to i_file_acl_lo
   2
   3 From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
   4
   5 Rename i_file_acl to i_file_acl_lo. This helps
   6 in finding bugs where we use i_file_acl instead
   7 of the combined i_file_acl_lo and i_file_acl_high
   8
   9 Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
  10 ---
  11
  12  fs/ext4/inode.c         |    4 ++--
  13  include/linux/ext4_fs.h |    2 +-
  14  2 files changed, 3 insertions(+), 3 deletions(-)
  15
  16
  17 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  18 index 9df9bad..c28bfcf 100644
  19 --- a/fs/ext4/inode.c
  20 +++ b/fs/ext4/inode.c
  21 @@ -2718,7 +2718,7 @@ void ext4_read_inode(struct inode * inode)
  22         }
  23         inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
  24         ei->i_flags = le32_to_cpu(raw_inode->i_flags);
  25 -       ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl);
  26 +       ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
  27         if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
  28             cpu_to_le32(EXT4_OS_HURD))
  29                 ei->i_file_acl |=
  30 @@ -2866,7 +2866,7 @@ static int ext4_do_update_inode(handle_t *handle,
  31             cpu_to_le32(EXT4_OS_HURD))
  32                 raw_inode->i_file_acl_high =
  33                         cpu_to_le16(ei->i_file_acl >> 32);
  34 -       raw_inode->i_file_acl = cpu_to_le32(ei->i_file_acl);
  35 +       raw_inode->i_file_acl_lo = cpu_to_le32(ei->i_file_acl);
  36         if (!S_ISREG(inode->i_mode)) {
  37                 raw_inode->i_dir_acl = cpu_to_le32(ei->i_dir_acl);
  38         } else {
  39 diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
  40 index 0d584ac..db0d426 100644
  41 --- a/include/linux/ext4_fs.h
  42 +++ b/include/linux/ext4_fs.h
  43 @@ -297,7 +297,7 @@ struct ext4_inode {
  44         } osd1;                         /* OS dependent 1 */
  45         __le32  i_block[EXT4_N_BLOCKS];/* Pointers to blocks */
  46         __le32  i_generation;   /* File version (for NFS) */
  47 -       __le32  i_file_acl;     /* File ACL */
  48 +       __le32  i_file_acl_lo;  /* File ACL */
  49         __le32  i_dir_acl;      /* Directory ACL */
  50         __le32  i_obso_faddr;   /* Obsoleted fragment address */
  51         union {