* [patch] direct-io: remove some left over checks
@ 2014-02-14 9:08 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2014-02-14 9:08 UTC (permalink / raw)
To: Alexander Viro; +Cc: linux-fsdevel, Christoph Hellwig, kernel-janitors
We know that "ret > 0" is true here. These tests were left over from
02afc27faec9 ('direct-io: Handle O_(D)SYNC AIO') and aren't needed any
more.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 1a5073959f32..6db7f7db7777 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -153,7 +153,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t err;
err = generic_write_sync(file, iocb->ki_pos - ret, ret);
- if (err < 0 && ret > 0)
+ if (err < 0)
ret = err;
}
blk_finish_plug(&plug);
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 0165b8672f09..7331a230e30b 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1797,7 +1797,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
BTRFS_I(inode)->last_sub_trans = root->log_transid;
if (num_written > 0) {
err = generic_write_sync(file, pos, num_written);
- if (err < 0 && num_written > 0)
+ if (err < 0)
num_written = err;
}
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c7a7def27b07..ba0d2b05bb78 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1523,7 +1523,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t err;
err = generic_write_sync(file, pos, ret);
- if (err < 0 && ret > 0)
+ if (err < 0)
ret = err;
}
blk_finish_plug(&plug);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [patch] direct-io: remove some left over checks
@ 2014-02-14 9:08 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2014-02-14 9:08 UTC (permalink / raw)
To: Alexander Viro; +Cc: linux-fsdevel, Christoph Hellwig, kernel-janitors
We know that "ret > 0" is true here. These tests were left over from
02afc27faec9 ('direct-io: Handle O_(D)SYNC AIO') and aren't needed any
more.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 1a5073959f32..6db7f7db7777 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -153,7 +153,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t err;
err = generic_write_sync(file, iocb->ki_pos - ret, ret);
- if (err < 0 && ret > 0)
+ if (err < 0)
ret = err;
}
blk_finish_plug(&plug);
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 0165b8672f09..7331a230e30b 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1797,7 +1797,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
BTRFS_I(inode)->last_sub_trans = root->log_transid;
if (num_written > 0) {
err = generic_write_sync(file, pos, num_written);
- if (err < 0 && num_written > 0)
+ if (err < 0)
num_written = err;
}
diff --git a/fs/block_dev.c b/fs/block_dev.c
index c7a7def27b07..ba0d2b05bb78 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1523,7 +1523,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
ssize_t err;
err = generic_write_sync(file, pos, ret);
- if (err < 0 && ret > 0)
+ if (err < 0)
ret = err;
}
blk_finish_plug(&plug);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [patch] direct-io: remove some left over checks
2014-02-14 9:08 ` Dan Carpenter
@ 2014-02-20 11:18 ` Jan Kara
-1 siblings, 0 replies; 4+ messages in thread
From: Jan Kara @ 2014-02-20 11:18 UTC (permalink / raw)
To: Dan Carpenter
Cc: Alexander Viro, linux-fsdevel, Christoph Hellwig, kernel-janitors
On Fri 14-02-14 12:08:47, Dan Carpenter wrote:
> We know that "ret > 0" is true here. These tests were left over from
> 02afc27faec9 ('direct-io: Handle O_(D)SYNC AIO') and aren't needed any
> more.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 1a5073959f32..6db7f7db7777 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -153,7 +153,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
> ssize_t err;
>
> err = generic_write_sync(file, iocb->ki_pos - ret, ret);
> - if (err < 0 && ret > 0)
> + if (err < 0)
> ret = err;
> }
> blk_finish_plug(&plug);
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 0165b8672f09..7331a230e30b 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -1797,7 +1797,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
> BTRFS_I(inode)->last_sub_trans = root->log_transid;
> if (num_written > 0) {
> err = generic_write_sync(file, pos, num_written);
> - if (err < 0 && num_written > 0)
> + if (err < 0)
> num_written = err;
> }
>
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index c7a7def27b07..ba0d2b05bb78 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -1523,7 +1523,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
> ssize_t err;
>
> err = generic_write_sync(file, pos, ret);
> - if (err < 0 && ret > 0)
> + if (err < 0)
> ret = err;
> }
> blk_finish_plug(&plug);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch] direct-io: remove some left over checks
@ 2014-02-20 11:18 ` Jan Kara
0 siblings, 0 replies; 4+ messages in thread
From: Jan Kara @ 2014-02-20 11:18 UTC (permalink / raw)
To: Dan Carpenter
Cc: Alexander Viro, linux-fsdevel, Christoph Hellwig, kernel-janitors
On Fri 14-02-14 12:08:47, Dan Carpenter wrote:
> We know that "ret > 0" is true here. These tests were left over from
> 02afc27faec9 ('direct-io: Handle O_(D)SYNC AIO') and aren't needed any
> more.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 1a5073959f32..6db7f7db7777 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -153,7 +153,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
> ssize_t err;
>
> err = generic_write_sync(file, iocb->ki_pos - ret, ret);
> - if (err < 0 && ret > 0)
> + if (err < 0)
> ret = err;
> }
> blk_finish_plug(&plug);
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 0165b8672f09..7331a230e30b 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -1797,7 +1797,7 @@ static ssize_t btrfs_file_aio_write(struct kiocb *iocb,
> BTRFS_I(inode)->last_sub_trans = root->log_transid;
> if (num_written > 0) {
> err = generic_write_sync(file, pos, num_written);
> - if (err < 0 && num_written > 0)
> + if (err < 0)
> num_written = err;
> }
>
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index c7a7def27b07..ba0d2b05bb78 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -1523,7 +1523,7 @@ ssize_t blkdev_aio_write(struct kiocb *iocb, const struct iovec *iov,
> ssize_t err;
>
> err = generic_write_sync(file, pos, ret);
> - if (err < 0 && ret > 0)
> + if (err < 0)
> ret = err;
> }
> blk_finish_plug(&plug);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-20 11:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-14 9:08 [patch] direct-io: remove some left over checks Dan Carpenter
2014-02-14 9:08 ` Dan Carpenter
2014-02-20 11:18 ` Jan Kara
2014-02-20 11:18 ` Jan Kara
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.