summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKiyoshi Ueda <k-ueda@ct.jp.nec.com>2006-12-08 02:41:02 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:29:08 -0800
commit74859364633963cb660c4fa518adca9ab1ca4229 (patch)
treecd160337dc49fc26c79adcf5af75c5940fe1bb43 /drivers
parentf00b16ad665a9b489d46f612679181f3f914917b (diff)
[PATCH] dm: tidy core formatting
Remove unnecessary spaces in dm.c. Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Cc: dm-devel@redhat.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/dm.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 7ec1b112a6d5..dd50e30b6dcf 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -89,7 +89,7 @@ struct mapped_device {
*/
atomic_t pending;
wait_queue_head_t wait;
- struct bio_list deferred;
+ struct bio_list deferred;
/*
* The current mapping.
@@ -482,7 +482,6 @@ static int clone_endio(struct bio *bio, unsigned int done, int error)
r = endio(tio->ti, bio, error, &tio->info);
if (r < 0)
error = r;
-
else if (r > 0)
/* the target wants another shot at the io */
return 1;
@@ -551,9 +550,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
clone->bi_sector);
generic_make_request(clone);
- }
-
- else if (r < 0) {
+ } else if (r < 0) {
/* error the io and bail out */
md = tio->io->md;
dec_pending(tio->io, r);
@@ -966,8 +963,8 @@ static struct mapped_device *alloc_dev(int minor)
md->queue->issue_flush_fn = dm_flush_all;
md->io_pool = mempool_create_slab_pool(MIN_IOS, _io_cache);
- if (!md->io_pool)
- goto bad2;
+ if (!md->io_pool)
+ goto bad2;
md->tio_pool = mempool_create_slab_pool(MIN_IOS, _tio_cache);
if (!md->tio_pool)