Skip to contentSkip to conversation

FAILED: patch "[PATCH] ext4: iterate over buffer heads correctly in" failed to apply to 4.5-stable tree

PATCH [email protected] 2 participants 3 messages Apr 10, 2016 – May 21, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 87f9a031af48defee9f34c6aaf06d6f1988c244d Mon Sep 17 00:00:00 2001

From: Eryu Guan <[email protected]>
Date: Sun, 21 Feb 2016 18:38:44 -0500
Subject: [PATCH] ext4: iterate over buffer heads correctly in
move_extent_per_page()

In commit bcff24887d00 ("ext4: don't read blocks from disk after extents being swapped") bh is not updated correctly in the for loop and wrong data has been written to disk. generic/324 catches this on sub-page block size ext4.

Fixes bcff24887d00 ("ext4: don't read blocks from disk after extentsbeing swapped")
fs/ext4/move_extent.c +1 -0
index e032a0423e35..4098acc701c3 100644
@@ -390,6 +390,7 @@ data_copy:
 		*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
 		if (*err < 0)
 			break;
+		bh = bh->b_this_page;
 	}
 	if (!*err)
 		*err = block_commit_write(pagep[0], from, from + replaced_size);
#1 lore raw

Hi greg,

Quoted 5 lines · On Sat, Apr 09, 2016 at 05:51:24PM -0700, [email protected] wrote:

The patch below does not apply to the 4.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

4.5 kernel has this patch already, so this failure is expected.

But 4.4 stable needs it as well, and the patch should be applied cleanly. Can you please consider adding commit 6ffe77bad545 ("ext4:
iterate over buffer heads correctly in move_extent_per_page()") to 4.4 stable tree?

Thanks!

Eryu

Quoted 36 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 87f9a031af48defee9f34c6aaf06d6f1988c244d Mon Sep 17 00:00:00 2001
From: Eryu Guan <[email protected]>
Date: Sun, 21 Feb 2016 18:38:44 -0500
Subject: [PATCH] ext4: iterate over buffer heads correctly in
move_extent_per_page()

In commit bcff24887d00 ("ext4: don't read blocks from disk after extents being swapped") bh is not updated correctly in the for loop and wrong data has been written to disk. generic/324 catches this on sub-page block size ext4.

Fixes bcff24887d00 ("ext4: don't read blocks from disk after extentsbeing swapped")
fs/ext4/move_extent.c +1 -0
index e032a0423e35..4098acc701c3 100644
@@ -390,6 +390,7 @@ data_copy:
 		*err = ext4_get_block(orig_inode, orig_blk_offset + i, bh, 0);
 		if (*err < 0)
 			break;
+		bh = bh->b_this_page;
 	}
 	if (!*err)
 		*err = block_commit_write(pagep[0], from, from + replaced_size);
author maintainer
#2 lore raw
Quoted 10 lines · Eryu Guan

Hi greg,

Quoted 5 lines · On Sat, Apr 09, 2016 at 05:51:24PM -0700, [email protected] wrote:

The patch below does not apply to the 4.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

4.5 kernel has this patch already, so this failure is expected.

That's a mess, how did this end up coming in twice? Oh well...

Quoted 4 lines

But 4.4 stable needs it as well, and the patch should be applied cleanly. Can you please consider adding commit 6ffe77bad545 ("ext4:
iterate over buffer heads correctly in move_extent_per_page()") to 4.4 stable tree?

Now queued up, thanks.

greg k-h