summaryrefslogtreecommitdiff
path: root/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-26 11:56:39 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-05-26 13:39:53 -0300
commit02f2b12475d685b7badb4335ff6cf2da6c4ae719 (patch)
tree8af797d24422dc3b32f0d2df50aeed1ee124c35f /kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
parent6be532a3cfddcfb1dc41746cba2b3be37f82e005 (diff)
downloadabslibre-02f2b12475d685b7badb4335ff6cf2da6c4ae719.tar.gz
abslibre-02f2b12475d685b7badb4335ff6cf2da6c4ae719.tar.bz2
abslibre-02f2b12475d685b7badb4335ff6cf2da6c4ae719.zip
linux-libre-knock-4.0.4_gnu-2: add proposed fix for data loss on md raid0 when discard is used (FS#45040 -> https://bugs.archlinux.org/task/45040)
Diffstat (limited to 'kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch')
-rw-r--r--kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
new file mode 100644
index 000000000..9f09102dc
--- /dev/null
+++ b/kernels/linux-libre-knock/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
@@ -0,0 +1,50 @@
+From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001
+From: Eric Work <work.eric@gmail.com>
+Date: Mon, 18 May 2015 23:26:23 -0700
+Subject: [PATCH] md/raid0: fix restore to sector variable in
+ raid0_make_request
+
+The variable "sector" in "raid0_make_request()" was improperly updated
+by a call to "sector_div()" which modifies its first argument in place.
+Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
+after the call for later re-use. Unfortunetly the restore was done after
+the referenced variable "bio" was advanced. This lead to the original
+value and the restored value being different. Here we move this line to
+the proper place.
+
+One observed side effect of this bug was discarding a file though
+unlinking would cause an unrelated file's contents to be discarded.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
+Cc: stable@vger.kernel.org (any that received above backport)
+URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
+---
+ drivers/md/raid0.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
+index 6a68ef5..efb654e 100644
+--- a/drivers/md/raid0.c
++++ b/drivers/md/raid0.c
+@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
+ ? (sector & (chunk_sects-1))
+ : sector_div(sector, chunk_sects));
+
++ /* Restore due to sector_div */
++ sector = bio->bi_iter.bi_sector;
++
+ if (sectors < bio_sectors(bio)) {
+ split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
+ bio_chain(split, bio);
+@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
+ split = bio;
+ }
+
+- sector = bio->bi_iter.bi_sector;
+ zone = find_zone(mddev->private, &sector);
+ tmp_dev = map_sector(mddev, zone, sector, &sector);
+ split->bi_bdev = tmp_dev->bdev;
+--
+2.4.1
+