projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[cascardo/linux.git]
/
fs
/
direct-io.c
diff --git
a/fs/direct-io.c
b/fs/direct-io.c
index
48d74c7
..
85882f6
100644
(file)
--- 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.
*/
* 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, in
t 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;
{
ssize_t transferred = 0;