From 5c684d9f9c8714f9cfb73231714cdd4d3b6aa21b Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Mon, 22 Jun 2009 10:12:18 +0100 Subject: [PATCH] --- yaml --- r: 154244 b: refs/heads/master c: 2761e95fe40ca0d01864310fa4d488d7c5e34e18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 779fbdefc363..39b6c34cfb82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 531fe96364f30879753d46c1f52ab839e12d2e5d +refs/heads/master: 2761e95fe40ca0d01864310fa4d488d7c5e34e18 diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index e34d694ddd04..910bce85f443 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -536,9 +536,11 @@ static void dec_pending(struct dm_io *io, int error) * Target requested pushing back the I/O. */ spin_lock_irqsave(&md->deferred_lock, flags); - if (__noflush_suspending(md)) - bio_list_add_head(&md->deferred, io->bio); - else + if (__noflush_suspending(md)) { + if (!bio_barrier(io->bio)) + bio_list_add_head(&md->deferred, + io->bio); + } else /* noflush suspend was interrupted. */ io->error = -EIO; spin_unlock_irqrestore(&md->deferred_lock, flags); @@ -1458,6 +1460,11 @@ static void process_barrier(struct mapped_device *md, struct bio *bio) if (md->barrier_error != DM_ENDIO_REQUEUE) bio_endio(bio, md->barrier_error); + else { + spin_lock_irq(&md->deferred_lock); + bio_list_add_head(&md->deferred, bio); + spin_unlock_irq(&md->deferred_lock); + } } /*