LU-8059 ldiskfs: wrong ldiskfs patch

Something went wrong with rebasing the ldiskfs patch in
http://review.whamcloud.com/#/c/16360/ LU-7132.

This patch includes the corrected version.

Change-Id: Ice4319f3ebedcdea781bd2198e8b62d010a304de
Signed-off-by: Andrew Perepechko <andrew.perepechko@seagate.com>
Seagate-bug-id: MRP-2688
Reviewed-on: http://review.whamcloud.com/19747
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>

diff --git a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-notalloc_under_idatasem.patch b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-notalloc_under_idatasem.patch
index bd6efcd..067543b 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-notalloc_under_idatasem.patch
+++ b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-notalloc_under_idatasem.patch
@@ -1,17 +1,14 @@
---- /dev/null
-+++ b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-notalloc_under_idatasem.patch
-@@ -0,0 +1,14 @@
-+Index: linux-stage/fs/ext4/extents.c
-+===================================================================
-+--- linux-stage.orig/fs/ext4/extents.c        2015-07-13 22:22:56.000000000 +0300
-++++ linux-stage/fs/ext4/extents.c     2015-07-13 22:24:05.000000000 +0300
-+@@ -4318,7 +4318,8 @@ static int ext4_find_delayed_extent(stru
-+      struct buffer_head *head = NULL;
-+      unsigned int nr_pages = PAGE_SIZE / sizeof(struct page *);
-+ 
-+-     pages = kmalloc(PAGE_SIZE, GFP_KERNEL);
-++     /* we are running under i_data_sem so don't re-enter fs code */
-++     pages = kmalloc(PAGE_SIZE, GFP_NOFS);
-+      if (pages == NULL)
-+              return -ENOMEM;
-+ 
+Index: linux-stage/fs/ext4/extents.c
+===================================================================
+--- linux-stage.orig/fs/ext4/extents.c 2015-07-13 22:22:56.000000000 +0300
++++ linux-stage/fs/ext4/extents.c      2015-07-13 22:24:05.000000000 +0300
+@@ -4318,7 +4318,8 @@ static int ext4_find_delayed_extent(stru
+       struct buffer_head *head = NULL;
+       unsigned int nr_pages = PAGE_SIZE / sizeof(struct page *);
+ 
+-      pages = kmalloc(PAGE_SIZE, GFP_KERNEL);
++      /* we are running under i_data_sem so don't reenter the FS code */
++      pages = kmalloc(PAGE_SIZE, GFP_NOFS);
+       if (pages == NULL)
+               return -ENOMEM;
+ 

diff --git a/ldiskfs/kernel_patches/patches/sles11sp1/ext4-notalloc_under_idatasem.patch b/ldiskfs/kernel_patches/patches/sles11sp1/ext4-notalloc_under_idatasem.patch
new file mode 100644 (file)
index 0000000..659228c
--- /dev/null
+++ b/ldiskfs/kernel_patches/patches/sles11sp1/ext4-notalloc_under_idatasem.patch
@@ -0,0 +1,14 @@
+Index: linux-stage/fs/ext4/extents.c
+===================================================================
+--- linux-stage.orig/fs/ext4/extents.c 2015-07-13 22:22:56.000000000 +0300
++++ linux-stage/fs/ext4/extents.c      2015-07-13 22:24:05.000000000 +0300
+@@ -3954,7 +3954,8 @@ static int ext4_ext_fiemap_cb(struct ino
+               struct buffer_head *head = NULL;
+               unsigned int nr_pages = PAGE_SIZE / sizeof(struct page *);
+ 
+-              pages = kmalloc(PAGE_SIZE, GFP_KERNEL);
++              /* we are running under i_data_sem so don't reenter the FS code */
++              pages = kmalloc(PAGE_SIZE, GFP_NOFS);
+               if (pages == NULL)
+                       return -ENOMEM;
+ 

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
index f8405dd..04f38fc 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series
@@ -37,5 +37,5 @@ rhel6.3/ext4-max-dir-size.patch
 sles11sp2/ext4-max-dir-size-options.patch
 rhel6.3/ext4-not-discard-preallocation-umount.patch
 rhel6.3/ext4-journal-path-opt.patch
-rhel6.3/ext4-notalloc_under_idatasem.patch
 sles11sp3/ext4_s_max_ext_tree_depth.patch
+sles11sp1/ext4-notalloc_under_idatasem.patch

diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
index 72124a1..37a8845 100644 (file)
--- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
+++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series
@@ -37,7 +37,7 @@ sles11sp2/ext4-max-dir-size-options.patch
 rhel6.3/ext4-not-discard-preallocation-umount.patch
 rhel6.3/ext4-journal-path-opt.patch
 sles11sp2/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
-rhel6.3/ext4-notalloc_under_idatasem.patch
 rhel6.5/ext4-give-warning-with-dir-htree-growing.patch
 sles11sp3/ext4-mmp-brelse.patch
 sles11sp3/ext4_s_max_ext_tree_depth.patch
+sles11sp1/ext4-notalloc_under_idatasem.patch