summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-04-26 10:58:46 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-04-26 17:33:08 +1000
commit821a48e5355bca05c966a05f493e3d2f0d03e329 (patch)
tree95500f818d436fae5806bc63f6e50f9de6ea0e9b
parent7d89ada246a081e5337539dd82ca79c27c78890b (diff)
block-aio-batch-completion-for-bios-kiocbs-checkpatch-fixes
WARNING: line over 80 characters #155: FILE: block/blk-core.c:2527: + unsigned int nr_bytes, unsigned int bidi_bytes, WARNING: line over 80 characters #177: FILE: block/blk-core.c:2643: +void blk_end_request_all_batch(struct request *rq, int error, struct batch_complete *batch) WARNING: line over 80 characters #186: FILE: block/blk-core.c:2651: + pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes, batch); WARNING: line over 80 characters #633: FILE: fs/direct-io.c:233: +static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is_async, WARNING: line over 80 characters #652: FILE: fs/direct-io.c:278: +static void dio_bio_end_aio(struct bio *bio, int error, struct batch_complete *batch) total: 0 errors, 5 warnings, 740 lines checked ./patches/block-aio-batch-completion-for-bios-kiocbs.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--block/blk-core.c9
-rw-r--r--fs/direct-io.c7
2 files changed, 10 insertions, 6 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 0981174ffc64..94aa4e75d626 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2509,7 +2509,8 @@ static bool blk_end_bidi_request(struct request *rq, int error,
* %true - still buffers pending for this request
**/
bool __blk_end_bidi_request(struct request *rq, int error,
- unsigned int nr_bytes, unsigned int bidi_bytes,
+ unsigned int nr_bytes,
+ unsigned int bidi_bytes,
struct batch_complete *batch)
{
if (blk_update_bidi_request(rq, error, nr_bytes, bidi_bytes, batch))
@@ -2625,7 +2626,8 @@ EXPORT_SYMBOL(__blk_end_request);
* Description:
* Completely finish @rq. Must be called with queue lock held.
*/
-void blk_end_request_all_batch(struct request *rq, int error, struct batch_complete *batch)
+void blk_end_request_all_batch(struct request *rq, int error,
+ struct batch_complete *batch)
{
bool pending;
unsigned int bidi_bytes = 0;
@@ -2633,7 +2635,8 @@ void blk_end_request_all_batch(struct request *rq, int error, struct batch_compl
if (unlikely(blk_bidi_rq(rq)))
bidi_bytes = blk_rq_bytes(rq->next_rq);
- pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq), bidi_bytes, batch);
+ pending = __blk_end_bidi_request(rq, error, blk_rq_bytes(rq),
+ bidi_bytes, batch);
BUG_ON(pending);
}
EXPORT_SYMBOL(blk_end_request_all_batch);
diff --git a/fs/direct-io.c b/fs/direct-io.c
index b8707bf52b82..b4dd97c8cea3 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -230,8 +230,8 @@ static inline struct page *dio_get_page(struct dio *dio,
* filesystems can use it to hold additional state between get_block calls and
* dio_complete.
*/
-static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is_async,
- struct batch_complete *batch)
+static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret,
+ bool is_async, struct batch_complete *batch)
{
ssize_t transferred = 0;
@@ -275,7 +275,8 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio);
/*
* Asynchronous IO callback.
*/
-static void dio_bio_end_aio(struct bio *bio, int error, struct batch_complete *batch)
+static void dio_bio_end_aio(struct bio *bio, int error,
+ struct batch_complete *batch)
{
struct dio *dio = bio->bi_private;
unsigned long remaining;