From 703d722434132735035a6a2619fa69fce79801fe Mon Sep 17 00:00:00 2001 From: Mikulas Patocka Date: Mon, 22 Jun 2009 10:12:17 +0100 Subject: [PATCH] --- yaml --- r: 154243 b: refs/heads/master c: 531fe96364f30879753d46c1f52ab839e12d2e5d h: refs/heads/master i: 154241: 180eb296d4228c08ab68a887f6d8294f46d5253b 154239: f0a982042d544433627fb5fc6005ad4d4d879e20 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm.c | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index aafdd8dd2271..779fbdefc363 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a926da5a16c01a8213331e5764472ce2f14a8d +refs/heads/master: 531fe96364f30879753d46c1f52ab839e12d2e5d diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c index 5e06f1e6234f..e34d694ddd04 100644 --- a/trunk/drivers/md/dm.c +++ b/trunk/drivers/md/dm.c @@ -1439,34 +1439,25 @@ static int dm_wait_for_completion(struct mapped_device *md, int interruptible) return r; } -static int dm_flush(struct mapped_device *md) +static void dm_flush(struct mapped_device *md) { dm_wait_for_completion(md, TASK_UNINTERRUPTIBLE); - return 0; } static void process_barrier(struct mapped_device *md, struct bio *bio) { - int error = dm_flush(md); + dm_flush(md); - if (unlikely(error)) { - bio_endio(bio, error); - return; - } if (bio_empty_barrier(bio)) { bio_endio(bio, 0); return; } __split_and_process_bio(md, bio); - - error = dm_flush(md); - - if (!error && md->barrier_error) - error = md->barrier_error; + dm_flush(md); if (md->barrier_error != DM_ENDIO_REQUEUE) - bio_endio(bio, error); + bio_endio(bio, md->barrier_error); } /*