direct-io: remove some left over checks
Subsystems (4)
PATCH 1/1 direct-io: remove some left over checks
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 <[email protected]>
fs/ext4/file.c +1 -1
@@ -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);
fs/btrfs/file.c +1 -1
@@ -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; }
fs/block_dev.c +1 -1
@@ -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);
Quoted 5 lines · Dan Carpenter
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 <[email protected]>
Looks good. You can add:
Reviewed-by Jan Kara <[email protected]>
Honza
Quoted 44 lines
fs/ext4/file.c +1
-1@@ -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);fs/btrfs/file.c +1
-1@@ -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; }fs/block_dev.c +1
-2@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR