LU-11255 kernel: kernel update [SLES12 SP3 4.4.143-94.47]

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / sles12sp2 / ext4-large-dir.patch

diff --git a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch
index 019daca..9c898c5 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch
+++ b/ldiskfs/kernel_patches/patches/sles12sp2/ext4-large-dir.patch
@@ -317,16 +317,16 @@ Index: linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c
 ===================================================================
 --- linux-3.10.0-229.1.2.fc21.x86_64.orig/fs/ext4/inode.c
 +++ linux-3.10.0-229.1.2.fc21.x86_64/fs/ext4/inode.c
-@@ -4056,7 +4056,7 @@ struct inode *ext4_iget(struct super_blo
-       if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT))
+@@ -4617,7 +4617,7 @@ struct inode *ext4_iget(struct super_blo
+       if (ext4_has_feature_64bit(sb))
                ei->i_file_acl |=
                        ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;
 -      inode->i_size = ext4_isize(raw_inode);
 +      inode->i_size = ext4_isize(sb, raw_inode);
-       ei->i_disksize = inode->i_size;
- #ifdef CONFIG_QUOTA
-       ei->i_reserved_quota = 0;
-@@ -4306,7 +4306,7 @@ static int ext4_do_update_inode(handle_t
+       if ((size = i_size_read(inode)) < 0) {
+               EXT4_ERROR_INODE(inode, "bad i_size value: %lld", size);
+               ret = -EFSCORRUPTED;
+@@ -4940,7 +4940,7 @@ static int ext4_do_update_inode(handle_t
                raw_inode->i_file_acl_high =
                        cpu_to_le16(ei->i_file_acl >> 32);
        raw_inode->i_file_acl_lo = cpu_to_le32(ei->i_file_acl);