LU-17950 ldiskfs: race in ext4_inode_attach_jinode

A race condition could happen when multiple threads
trying to attach jinode for the same inode:

Thread 1:
ext4_map_blocks
  ext4_inode_attach_jinode
    spin_lock(&inode->i_lock)
    ei->jinode = jinode
->
    jbd2_journal_init_jbd_inode(ei->jinode, inode)

Thread 2:
ext4_map_blocks
  ext4_inode_attach_jinode
    if (ei->jinode || !EXT4_SB(inode->i_sb)->s_journal)
	    return 0;
  ext4_jbd2_inode_add_write
->  jbd2_journal_file_inode

The problem is in ext4_inode_attach_jinode() the initial check
of ei->jinode is not protected by inode->i_lock,
thread 2 could go ahead and use the not yet initialized jinode
in jbd2_journal_file_inode(), and thread 1 later will
use jbd2_journal_init_jbd_inode, corrupting the jinode.

Note this issue is specific to ldiskfs because of
ext4-attach-jinode-in-writepages.patch added
ext4_inode_attach_jinode() to make sure jinode is initialized
before calling ext4_jbd2_inode_add_write().

Change-Id: Iafd7aa9537505afbf4bc53fef40ea3aa0a94b7da
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58381
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/ldiskfs/kernel_patches/patches/base/ext4-fix-ext4_inode_attach_jinode.patch b/ldiskfs/kernel_patches/patches/base/ext4-fix-ext4_inode_attach_jinode.patch
new file mode 100644 (file)
index 0000000..4d0615e
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/base/ext4-fix-ext4_inode_attach_jinode.patch
@@ -0,0 +1,29 @@
+Index: linux/fs/ext4/inode.c
+===================================================================
+--- linux.orig/fs/ext4/inode.c
++++ linux/fs/ext4/inode.c
+@@ -4461,18 +4461,19 @@ int ext4_inode_attach_jinode(struct inod
+       struct ext4_inode_info *ei = EXT4_I(inode);
+       struct jbd2_inode *jinode;
+ 
+-      if (ei->jinode || !EXT4_SB(inode->i_sb)->s_journal)
++      if (READ_ONCE(ei->jinode) || !EXT4_SB(inode->i_sb)->s_journal)
+               return 0;
+ 
+-      jinode = jbd2_alloc_inode(GFP_KERNEL);
++      jinode = jbd2_alloc_inode(GFP_NOFS);
+       spin_lock(&inode->i_lock);
+-      if (!ei->jinode) {
++      if (!READ_ONCE(ei->jinode)) {
+               if (!jinode) {
+                       spin_unlock(&inode->i_lock);
+                       return -ENOMEM;
+               }
+-              ei->jinode = jinode;
+-              jbd2_journal_init_jbd_inode(ei->jinode, inode);
++              jbd2_journal_init_jbd_inode(jinode, inode);
++              smp_wmb();
++              WRITE_ONCE(ei->jinode, jinode);
+               jinode = NULL;
+       }
+       spin_unlock(&inode->i_lock);

diff --git a/ldiskfs/kernel_patches/patches/rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch b/ldiskfs/kernel_patches/patches/rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
deleted file mode 100644 (file)
index 5abe23e..0000000
--- a/ldiskfs/kernel_patches/patches/rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
-index 153dda7..63339a2 100644
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -3775,7 +3775,7 @@ int ext4_inode_attach_jinode(struct inode *inode)
-       if (ei->jinode || !EXT4_SB(inode->i_sb)->s_journal)
-               return 0;
- 
--      jinode = jbd2_alloc_inode(GFP_KERNEL);
-+      jinode = jbd2_alloc_inode(GFP_NOFS);
-       spin_lock(&inode->i_lock);
-       if (!ei->jinode) {
-               if (!jinode) {

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
index 5f28276..0646612 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.9.series
@@ -31,7 +31,7 @@ rhel7.6/ext4-dont-check-before-replay.patch
 rhel7.6/ext4-cleanup-goto-next-group.patch
 rhel7.6/ext4-reduce-lock-contention-in-__ext4_new_inode.patch
 rhel7.6/ext4-preread-gd.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel7.6/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch
 rhel7.6/ext4-export-mb-stream-allocator-variables.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15-22.series b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15-22.series
index 41e4762..12ceff8 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15-22.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15-22.series
@@ -21,7 +21,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 ubuntu18/ext4-attach-jinode-in-writepages.patch
 suse15/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-optimize-ext4_find_delalloc_range-in-nodelalloc.patch
 rhel7.6/ext4-export-orphan-add.patch
 suse15/ext4-export-mb-stream-allocator-variables.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15.series b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15.series
index 0a4eb11..269629c 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15.series
@@ -21,7 +21,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 suse15/ext4-attach-jinode-in-writepages.patch
 suse15/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-optimize-ext4_find_delalloc_range-in-nodelalloc.patch
 rhel7.6/ext4-export-orphan-add.patch
 suse15/ext4-export-mb-stream-allocator-variables.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1-7.series b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1-7.series
index 0a94c42..392b828 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1-7.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1-7.series
@@ -21,7 +21,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 ubuntu18/ext4-attach-jinode-in-writepages.patch
 suse15/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-optimize-ext4_find_delalloc_range-in-nodelalloc.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-ext-merge.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1.series b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1.series
index 41981bf..fc4b2b8 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.12-sles15sp1.series
@@ -21,7 +21,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 suse15/ext4-attach-jinode-in-writepages.patch
 suse15/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-optimize-ext4_find_delalloc_range-in-nodelalloc.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-ext-merge.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series
index ed6e4fb..ceab062 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series
@@ -18,7 +18,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 ubuntu18/ext4-attach-jinode-in-writepages.patch
 ubuntu18/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel7.6/ext4-mmp-dont-mark-bh-dirty.patch
 ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series
index e0a935f..0e4aa26 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series
@@ -18,7 +18,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 ubuntu18/ext4-attach-jinode-in-writepages.patch
 ubuntu18/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel7.6/ext4-mmp-dont-mark-bh-dirty.patch
 ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series
index ea6a0d1..9fef225 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10-553.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10.series
index d016e39..948b74b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.10.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.4.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.4.series
index bf2aed1..c6a006b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.4.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.5.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.5.series
index f228bb1..34c7a9b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.5.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.6.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.6.series
index fd78795..b53e4cd 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.6.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.6.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
index ea6a0d1..9fef225 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.7.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
index ea6a0d1..9fef225 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.8.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.9.series b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.9.series
index ea6a0d1..9fef225 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-4.18-rhel8.9.series
@@ -19,7 +19,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 rhel8.2/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 rhel8/ext4-simple-blockalloc.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series b/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series
index 8265f95..7c51902 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.0.0-13-ubuntu19.series
@@ -18,7 +18,7 @@ ubuntu18/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 ubuntu18/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
index c9cddab..fa4b1e7 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-ml.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203.series b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203.series
index fdf44ca..6a5ec94 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203sp1.series b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203sp1.series
index 25418dc..5e43d3f 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203sp1.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.10.0-oe2203sp1.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.11.0-40-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.11.0-40-ubuntu20.series
index cca167d..04f625b 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.11.0-40-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.11.0-40-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
index f304b43..5d6e56f 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.1.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.2.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.2.series
index 26b124d..f5d61a6 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.2.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.2.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel9.2/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.3.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.3.series
index 19c79c4..f7a9da8 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.3.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.3.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel9.2/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series
index ce45357..9c4b5fb 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4-427.13.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4.series
index a9d2003..f8014c7 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.4.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.5.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.5.series
index 74d2f61..42c95ac 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.5.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
index 6c5501d..885622c 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14-rhel9.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.14/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp4.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp4.series
index 8ef110e..50dd678 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp4.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp4.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.14/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp5.series b/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp5.series
index 66302c3..eca5188 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp5.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.14.21-sles15sp5.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.14/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-106-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-106-ubuntu20.series
index 2d33c51..be77e23 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-106-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-106-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 ubuntu20.04.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-83-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-83-ubuntu20.series
index f8bbb6b..0b80caf 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-83-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.15.0-83-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.10/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 ubuntu20.04.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.19.0-35-ubuntu.series b/ldiskfs/kernel_patches/series/ldiskfs-5.19.0-35-ubuntu.series
index 66b4a60..5bf7790 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.19.0-35-ubuntu.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.19.0-35-ubuntu.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp2.series b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp2.series
index c3cd788..dd738e1 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp2.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp2.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series
index 329503c..1c64534 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3-59.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series
index 1b52bbc..1f6534a 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.3.18-sles15sp3.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series
index 45f5ab9..2d847f5 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-42-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series
index 92955f5..3877752 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-66-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series
index 9b93072..2b26c15 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-80-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series
index 0ebb688..4756eda 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-90-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series
index 939a7ea..186e093 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.0-ml.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series
index 5159c10..1101f20 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.136-ml.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series
index 45f5ab9..2d847f5 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.4.21-ml.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 rhel8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series
index 47e9d35..1c2b371 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-53-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series
index f654845..6d49e6c 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-5.8.0-63-ubuntu20.series
@@ -18,7 +18,7 @@ linux-5.4/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.4/ext4-attach-jinode-in-writepages.patch
 rhel8/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.8/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.1.38-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-6.1.38-ml.series
index f0eb25f..d2e4846 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.1.38-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.1.38-ml.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-5.10/ext4-attach-jinode-in-writepages.patch
 linux-6.1/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.10-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-6.10-ml.series
index 0767636..f534161 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.10-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.10-ml.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.11-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-6.11-ml.series
index bd5bb68..110bd5c 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.11-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.11-ml.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.6-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-6.6-ml.series
index b31263f..b0e4123 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.6-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.6-ml.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.7-ml.series b/ldiskfs/kernel_patches/series/ldiskfs-6.7-ml.series
index dd4911a..55bdec2 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.7-ml.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.7-ml.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series b/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series
index 17ffb37..fc45e33 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-6.8.0-45-ubuntu24.series
@@ -18,7 +18,7 @@ rhel9/ext4-give-warning-with-dir-htree-growing.patch
 ubuntu18/ext4-jcb-optimization.patch
 linux-6.2/ext4-attach-jinode-in-writepages.patch
 linux-6.5/ext4-dont-check-before-replay.patch
-rhel7.6/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch
+base/ext4-fix-ext4_inode_attach_jinode.patch
 rhel7.6/ext4-export-orphan-add.patch
 linux-5.18/ext4-export-mb-stream-allocator-variables.patch
 ubuntu19/ext4-iget-with-flags.patch