diff options
author | Edward Shishkin <edward.shishkin@gmail.com> | 2010-10-26 14:22:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 16:52:13 -0700 |
commit | cd1c584f380183aca268d454c14b22d8454eac4f (patch) | |
tree | 7722f634ecfcaead2b76ea8e483f3c6d2bd184c4 /fs/direct-io.c | |
parent | 2473238eac95ba6dd2c4ba19cc36aaf01465076b (diff) | |
download | linux-3.10-cd1c584f380183aca268d454c14b22d8454eac4f.tar.gz linux-3.10-cd1c584f380183aca268d454c14b22d8454eac4f.tar.bz2 linux-3.10-cd1c584f380183aca268d454c14b22d8454eac4f.zip |
fs/direct-io.c: fix truncation error in dio_complete() return
Fix up truncation (ssize_t->int). This only matters with >2G
reads/writes, which the kernel doesn't permit.
Signed-off-by: Edward Shishkin <edward@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/direct-io.c')
-rw-r--r-- | fs/direct-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 48d74c7391d..85882f6ba5f 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -218,7 +218,7 @@ static struct page *dio_get_page(struct dio *dio) * filesystems can use it to hold additional state between get_block calls and * dio_complete. */ -static int dio_complete(struct dio *dio, loff_t offset, int ret, bool is_async) +static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret, bool is_async) { ssize_t transferred = 0; |