From 68d1f41d6e8f1737f63bebe3147294e6b3ee09d7 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Thu, 18 Mar 2021 17:44:55 -0700 Subject: [PATCH] RM-633 ldiskfs: fix conflict in rhel7.7/ext4-loadbitmaps.patch This patch fixes the conflict in fs/ext4/super.c. Test-Parameters: trivial Fixes: c5b92c3ec0 ("RM-633 ldiskfs: add loadbitmaps to load block bitmaps for rhel7.7") Change-Id: Ia7a79fb7abc7c99866d7cd885bca837bde3ebbe5 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/42096 Tested-by: jenkins Reviewed-by: Wang Shilong Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- .../kernel_patches/patches/rhel7.7/ext4-loadbitmaps.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/rhel7.7/ext4-loadbitmaps.patch b/ldiskfs/kernel_patches/patches/rhel7.7/ext4-loadbitmaps.patch index 8c342ae..c250265 100644 --- a/ldiskfs/kernel_patches/patches/rhel7.7/ext4-loadbitmaps.patch +++ b/ldiskfs/kernel_patches/patches/rhel7.7/ext4-loadbitmaps.patch @@ -119,7 +119,7 @@ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 18fe358..51935c1 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -838,6 +838,11 @@ static void ext4_put_super(struct super_block *sb) +@@ -838,6 +838,11 @@ static void ext4_put_super(struct super_ int aborted = 0; int i, err; @@ -131,7 +131,7 @@ index 18fe358..51935c1 100644 ext4_unregister_li_request(sb); ext4_quota_off_umount(sb); -@@ -2722,6 +2727,13 @@ static ssize_t sbi_ui_store(struct ext4_attr *a, +@@ -2721,6 +2726,13 @@ static ssize_t sbi_ui_store(struct ext4_ return ret; if (strcmp("max_dir_size", a->attr.name) == 0) t >>= 10; @@ -145,7 +145,7 @@ index 18fe358..51935c1 100644 *ui = t; return count; } -@@ -2918,6 +2930,7 @@ EXT4_RW_ATTR_SBI_UI(warning_ratelimit_interval_ms, s_warning_ratelimit_state.int +@@ -2919,6 +2931,7 @@ EXT4_RW_ATTR_SBI_UI(warning_ratelimit_in EXT4_RW_ATTR_SBI_UI(warning_ratelimit_burst, s_warning_ratelimit_state.burst); EXT4_RW_ATTR_SBI_UI(msg_ratelimit_interval_ms, s_msg_ratelimit_state.interval); EXT4_RW_ATTR_SBI_UI(msg_ratelimit_burst, s_msg_ratelimit_state.burst); @@ -153,10 +153,10 @@ index 18fe358..51935c1 100644 EXT4_RO_ATTR_ES_UI(errors_count, s_error_count); EXT4_RO_ATTR_ES_UI(first_error_time, s_first_error_time); EXT4_RO_ATTR_ES_UI(last_error_time, s_last_error_time); -@@ -2954,6 +2967,7 @@ static struct attribute *ext4_attrs[] = { - ATTR_LIST(errors_count), - ATTR_LIST(first_error_time), +@@ -2957,6 +2970,7 @@ static struct attribute *ext4_attrs[] = ATTR_LIST(last_error_time), + ATTR_LIST(mb_prefetch), + ATTR_LIST(mb_prefetch_limit), + ATTR_LIST(loadbitmaps), NULL, }; -- 1.8.3.1