summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-04-26 10:58:43 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-04-26 17:33:07 +1000
commitf48eb46d79115c6076bde4ac4c33da0a79833b93 (patch)
treed3ace378b0f55ad45b1128f7d3540dd6d10fc353
parentfea6c55d099c6f0dccdb3d1cd87e7e9682d144a1 (diff)
block-prep-work-for-batch-completion-checkpatch-fixes
WARNING: line over 80 characters #116: FILE: drivers/block/drbd/drbd_bitmap.c:940: +static void bm_async_io_complete(struct bio *bio, int error, struct batch_complete *batch) WARNING: line over 80 characters #128: FILE: drivers/block/drbd/drbd_worker.c:67: +void drbd_md_io_complete(struct bio *bio, int error, struct batch_complete *batch) WARNING: line over 80 characters #137: FILE: drivers/block/drbd/drbd_worker.c:169: +void drbd_peer_request_endio(struct bio *bio, int error, struct batch_complete *batch) WARNING: line over 80 characters #146: FILE: drivers/block/drbd/drbd_worker.c:205: +void drbd_request_endio(struct bio *bio, int error, struct batch_complete *batch) ERROR: "foo * bar" should be "foo *bar" #562: FILE: drivers/md/raid5.c:1743: +static void raid5_end_read_request(struct bio * bi, int error, WARNING: line over 80 characters #946: FILE: fs/btrfs/volumes.c:5021: +static void btrfs_end_bio(struct bio *bio, int err, struct batch_complete *batch) WARNING: Avoid CamelCase: <lbmIODone> #1087: FILE: fs/jfs/jfs_logmgr.c:2157: + lbmIODone(bio, 0, NULL); total: 1 errors, 6 warnings, 1037 lines checked ./patches/block-prep-work-for-batch-completion.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Kent Overstreet <koverstreet@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/block/drbd/drbd_bitmap.c3
-rw-r--r--drivers/block/drbd/drbd_worker.c9
-rw-r--r--drivers/md/raid5.c2
-rw-r--r--fs/btrfs/volumes.c3
4 files changed, 11 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index c01f27d571a7..046aa1793514 100644
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -948,7 +948,8 @@ static void bm_aio_ctx_destroy(struct kref *kref)
}
/* bv_page may be a copy, or may be the original */
-static void bm_async_io_complete(struct bio *bio, int error, struct batch_complete *batch)
+static void bm_async_io_complete(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct bm_aio_ctx *ctx = bio->bi_private;
struct drbd_conf *mdev = ctx->mdev;
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index b81a1eb4c123..04a80af8fddb 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -64,7 +64,8 @@ rwlock_t global_state_lock;
/* used for synchronous meta data and bitmap IO
* submitted by drbd_md_sync_page_io()
*/
-void drbd_md_io_complete(struct bio *bio, int error, struct batch_complete *batch)
+void drbd_md_io_complete(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct drbd_md_io *md_io;
struct drbd_conf *mdev;
@@ -167,7 +168,8 @@ static void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req) __rel
/* writes on behalf of the partner, or resync writes,
* "submitted" by the receiver.
*/
-void drbd_peer_request_endio(struct bio *bio, int error, struct batch_complete *batch)
+void drbd_peer_request_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct drbd_peer_request *peer_req = bio->bi_private;
struct drbd_conf *mdev = peer_req->w.mdev;
@@ -203,7 +205,8 @@ void drbd_peer_request_endio(struct bio *bio, int error, struct batch_complete *
/* read, readA or write requests on R_PRIMARY coming from drbd_make_request
*/
-void drbd_request_endio(struct bio *bio, int error, struct batch_complete *batch)
+void drbd_request_endio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
unsigned long flags;
struct drbd_request *req = bio->bi_private;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index fc425663f6a8..f745a1b86e1d 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1776,7 +1776,7 @@ static void shrink_stripes(struct r5conf *conf)
conf->slab_cache = NULL;
}
-static void raid5_end_read_request(struct bio * bi, int error,
+static void raid5_end_read_request(struct bio *bi, int error,
struct batch_complete *batch)
{
struct stripe_head *sh = bi->bi_private;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 96607dfb8996..0182898a6c88 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5029,7 +5029,8 @@ static unsigned int extract_stripe_index_from_bio_private(void *bi_private)
return (unsigned int)((uintptr_t)bi_private) & 3;
}
-static void btrfs_end_bio(struct bio *bio, int err, struct batch_complete *batch)
+static void btrfs_end_bio(struct bio *bio, int err,
+ struct batch_complete *batch)
{
struct btrfs_bio *bbio = extract_bbio_from_bio_private(bio->bi_private);
int is_orig_bio = 0;