From de0609f4b204a375e3eb3a4e12abc0c8f3c9bb9d Mon Sep 17 00:00:00 2001
From: Edward Shishkin <edward.shishkin@gmail.com>
Date: Tue, 26 Oct 2010 14:22:28 -0700
Subject: [PATCH] --- yaml --- r: 217517 b: refs/heads/master c:
 cd1c584f380183aca268d454c14b22d8454eac4f h: refs/heads/master i:   217515:
 d1ca78ccd05ea224dcd6513d1d8dc834cd11e0c2 v: v3

---
 [refs]               | 2 +-
 trunk/fs/direct-io.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 70d3bc9750dc..1a68f3f7d9b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2473238eac95ba6dd2c4ba19cc36aaf01465076b
+refs/heads/master: cd1c584f380183aca268d454c14b22d8454eac4f
diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c
index 48d74c7391d1..85882f6ba5f7 100644
--- a/trunk/fs/direct-io.c
+++ b/trunk/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;