diff options
| author | Namhyung Kim <namhyung@gmail.com> | 2011-06-20 13:27:44 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-06-20 13:27:44 +0200 |
| commit | 44194e3e88fcfe77a2a6e2333847d4f27816259a (patch) | |
| tree | 66d3aa40d385570b0c269b28371f086fa6ca6244 /block/bsg.c | |
| parent | 80ceb057135ad77f513277f3bcd04b885501877a (diff) | |
| download | op-kernel-dev-44194e3e88fcfe77a2a6e2333847d4f27816259a.zip op-kernel-dev-44194e3e88fcfe77a2a6e2333847d4f27816259a.tar.gz | |
bsg: remove unnecessary conditional expressions
Second condition in OR always implies first condition is false
thus bytes_read in the second is not needed. The same goes to
bytes_written.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/bsg.c')
| -rw-r--r-- | block/bsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/bsg.c b/block/bsg.c index c4f49e2..b7e42ad 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -606,7 +606,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) ret = __bsg_read(buf, count, bd, NULL, &bytes_read); *ppos = bytes_read; - if (!bytes_read || (bytes_read && err_block_err(ret))) + if (!bytes_read || err_block_err(ret)) bytes_read = ret; return bytes_read; @@ -686,7 +686,7 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) /* * return bytes written on non-fatal errors */ - if (!bytes_written || (bytes_written && err_block_err(ret))) + if (!bytes_written || err_block_err(ret)) bytes_written = ret; dprintk("%s: returning %Zd\n", bd->name, bytes_written); |
