debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Update md fix for #696650 to upstream committed version 

svn path=/dists/sid/linux/; revision=19800
This commit is contained in:
Ben Hutchings 2013-02-11 04:00:47 +00:00
parent 8d55151460
commit 37eaac645b
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
debian/patches/bugfix/all/md-protect-against-crash-upon-fsync-on-ro-array.patch vendored
View File

@ -1,35 +1,41 @@
From: Sebastian Riemer <sebastian.riemer@profitbricks.com> From: Sebastian Riemer <sebastian.riemer@profitbricks.com>
Date: Fri, 25 Jan 2013 12:46:59 +0100 Date: Fri, 25 Jan 2013 12:46:59 +0100
Subject: [PATCH] md: protect against crash upon fsync on ro array Subject: md: protect against crash upon fsync on ro array
Bug-Debian: http://bugs.debian.org/696650 Bug-Debian: http://bugs.debian.org/696650
If an fsync occurrs on a read-only array, we need to send a commit 0ecfa11f08c79be05eb00bba537e764e6672774d upstream.
If an fsync occurs on a read-only array, we need to send a
completion for the IO and may not increment the active IO count. completion for the IO and may not increment the active IO count.
Otherwise, we hit a bug trace and can't stop the MD array anymore. Otherwise, we hit a bug trace and can't stop the MD array anymore.
As return value -EROFS makes most sense. By advice of Christoph Hellwig we return success upon a flush
request but we return -EROFS for other writes.
We detect flush requests by checking if the bio has zero sectors.
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: NeilBrown <neilb@suse.de>
Signed-off-by: Sebastian Riemer <sebastian.riemer@profitbricks.com> Signed-off-by: Sebastian Riemer <sebastian.riemer@profitbricks.com>
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: NeilBrown <neilb@suse.de>
--- ---
drivers/md/md.c | 5 +++++ drivers/md/md.c | 4 ++++
1 files changed, 5 insertions(+), 0 deletions(-) 1 file changed, 4 insertions(+)
diff --git a/drivers/md/md.c b/drivers/md/md.c diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3db3d1b..475e0be 100644 index 3db3d1b..1e634a6 100644
--- a/drivers/md/md.c --- a/drivers/md/md.c
+++ b/drivers/md/md.c +++ b/drivers/md/md.c
@@ -322,6 +322,11 @@ static void md_make_request(struct request_queue *q, struct bio *bio) @@ -307,6 +307,10 @@ static void md_make_request(struct request_queue *q, struct bio *bio)
} bio_io_error(bio);
finish_wait(&mddev->sb_wait, &__wait); return;
} }
+ if (mddev->ro == 1 && unlikely(rw == WRITE)) { + if (mddev->ro == 1 && unlikely(rw == WRITE)) {
+ rcu_read_unlock(); + bio_endio(bio, bio_sectors(bio) == 0 ? 0 : -EROFS);
+ bio_endio(bio, -EROFS);
+ return; + return;
+ } + }
atomic_inc(&mddev->active_io); smp_rmb(); /* Ensure implications of 'active' are visible */
rcu_read_unlock(); rcu_read_lock();
if (mddev->suspended) {
--
1.7.1