diff options
| author | NeilBrown <neilb@suse.de> | 2014-09-22 02:06:23 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-09-22 02:18:03 +0200 |
| commit | f0cc9a057151892b885be21a1d19b0185568281d (patch) | |
| tree | 121cf9034f9e5b081c36aa6135bbcee7d6614555 /drivers/md | |
| parent | Merge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-f0cc9a057151892b885be21a1d19b0185568281d.tar.xz linux-f0cc9a057151892b885be21a1d19b0185568281d.zip | |
md/raid1: intialise start_next_window for READ case to avoid hang
r1_bio->start_next_window is not initialised in the READ
case, so allow_barrier may incorrectly decrement
conf->current_window_requests
which can cause raise_barrier() to block forever.
Fixes: 79ef3a8aa1cb1523cc231c9a90a278333c21f761
cc: stable@vger.kernel.org (v3.13+)
Reported-by: Brassow Jonathan <jbrassow@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index d7690f86fdb9..9ebccf624571 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1186,6 +1186,7 @@ read_again: atomic_read(&bitmap->behind_writes) == 0); } r1_bio->read_disk = rdisk; + r1_bio->start_next_window = 0; read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev); bio_trim(read_bio, r1_bio->sector - bio->bi_iter.bi_sector, |