Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45d4f855 authored by Dan Carpenter's avatar Dan Carpenter Committed by Linus Torvalds
Browse files

fs/direct-io.c: remove some left over checks 



We know that "ret > 0" is true here.  These tests were left over from
commit 02afc27f ('direct-io: Handle O_(D)SYNC AIO') and aren't
needed any more.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2b665e27

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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);