Subject: [merged] direct-io-remove-some-left-over-checks.patch removed from -mm tree
To: dan.carpenter@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:30:46 -0700
The patch titled
Subject: fs/direct-io.c: remove some left over checks
has been removed from the -mm tree. Its filename was
direct-io-remove-some-left-over-checks.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: fs/direct-io.c: 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 <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/block_dev.c | 2 +-
fs/btrfs/file.c | 2 +-
fs/ext4/file.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/block_dev.c~direct-io-remove-some-left-over-checks fs/block_dev.c
--- a/fs/block_dev.c~direct-io-remove-some-left-over-checks
+++ a/fs/block_dev.c
@@ -1523,7 +1523,7 @@ ssize_t blkdev_aio_write(struct kiocb *i
ssize_t err;
err = generic_write_sync(file, pos, ret);
- if (err < 0 && ret > 0)
+ if (err < 0)
ret = err;
}
blk_finish_plug(&plug);
diff -puN fs/btrfs/file.c~direct-io-remove-some-left-over-checks fs/btrfs/file.c
--- a/fs/btrfs/file.c~direct-io-remove-some-left-over-checks
+++ a/fs/btrfs/file.c
@@ -1797,7 +1797,7 @@ static ssize_t btrfs_file_aio_write(stru
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 -puN fs/ext4/file.c~direct-io-remove-some-left-over-checks fs/ext4/file.c
--- a/fs/ext4/file.c~direct-io-remove-some-left-over-checks
+++ a/fs/ext4/file.c
@@ -153,7 +153,7 @@ ext4_file_dio_write(struct kiocb *iocb,
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);
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
origin.patch
ncpfs-cleanup-indenting-in-ncp_lookup.patch
drivers-misc-sgi-gru-grukdumpc-cleanup-gru_dump_context-a-little.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
