dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes

ERROR: trailing whitespace
#180: FILE: fs/direct-io.c:1103:
+^Iunsigned long user_addr; $

ERROR: need consistent spacing around '+' (ctx:WxV)
#223: FILE: fs/direct-io.c:1213:
+			((user_addr+iov[seg].iov_len +PAGE_SIZE-1)/PAGE_SIZE
 			                             ^

ERROR: trailing whitespace
#247: FILE: fs/direct-io.c:1237:
+^I$

total: 3 errors, 0 warnings, 297 lines checked

NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or
      scripts/cleanfile

./patches/dio-merge-direct_io_walker-into-__blockdev_direct_io.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: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <>

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 8a4397d8a69b3f8b190c3900baaee541bdc414c0..b38314dc19bcdb6efae781d671455adba13a2c5e 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1096,7 +1096,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
        loff_t end = offset;
        struct dio *dio;
        struct dio_submit sdio = { 0, };
-       unsigned long user_addr; 
+       unsigned long user_addr;
        size_t bytes;
        struct buffer_head map_bh = { 0, };
 
@@ -1206,7 +1206,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
        for (seg = 0; seg < nr_segs; seg++) {
                user_addr = (unsigned long)iov[seg].iov_base;
                sdio.pages_in_io +=
-                       ((user_addr+iov[seg].iov_len +PAGE_SIZE-1)/PAGE_SIZE
+                       ((user_addr+iov[seg].iov_len + PAGE_SIZE - 1)/PAGE_SIZE
                                - user_addr/PAGE_SIZE);
        }
 
@@ -1230,7 +1230,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
                }
                sdio.total_pages += (bytes + PAGE_SIZE - 1) / PAGE_SIZE;
                sdio.curr_user_address = user_addr;
-       
+
                retval = do_direct_IO(dio, &sdio, &map_bh);
 
                dio->result += iov[seg].iov_len -