Skip to contentSkip to conversation

direct-io: remove some left over checks

PATCH In review Dan Carpenter 2 participants 2 messages Feb 14, 2014 – Feb 20, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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.

fs/ext4/file.c +1 -1
index 1a5073959f32..6db7f7db7777 100644
@@ -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
index 0165b8672f09..7331a230e30b 100644
@@ -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
index c7a7def27b07..ba0d2b05bb78 100644
@@ -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);
reviewer Reviewed-by on v1 1/1
#1 lore raw
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.

Looks good. You can add:

Honza

Quoted 44 lines
fs/ext4/file.c +1 -1
index 1a5073959f32..6db7f7db7777 100644
@@ -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
index 0165b8672f09..7331a230e30b 100644
@@ -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
index c7a7def27b07..ba0d2b05bb78 100644
@@ -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