The patch titled
dm: tidy core formatting
has been added to the -mm tree. Its filename is
dm-tidy-core-formatting.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: dm: tidy core formatting
From: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx>
Remove unnecessary spaces in dm.c.
Signed-off-by: Kiyoshi Ueda <k-ueda@xxxxxxxxxxxxx>
Signed-off-by: Jun'ichi Nomura <j-nomura@xxxxxxxxxxxxx>
Signed-off-by: Alasdair G Kergon <agk@xxxxxxxxxx>
Cc: dm-devel@xxxxxxxxxx
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/md/dm.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff -puN drivers/md/dm.c~dm-tidy-core-formatting drivers/md/dm.c
--- a/drivers/md/dm.c~dm-tidy-core-formatting
+++ a/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,
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 *
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(i
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)
_
Patches currently in -mm which might be from k-ueda@xxxxxxxxxxxxx are
dm-tidy-core-formatting.patch
dm-suspend-parameter-change.patch
dm-map-and-endio-return-code-clarification.patch
dm-map-and-endio-symbolic-return-codes.patch
dm-ioctl-add-noflush-suspend.patch
dm-suspend-add-noflush-pushback.patch
dm-mpath-use-noflush-suspending.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
