From 4f6343657b6578b8a108086767db609588e72377 Mon Sep 17 00:00:00 2001
From: Mingming <cmm@us.ibm.com>
Date: Tue, 10 Nov 2009 10:48:08 -0500
Subject: [PATCH] --- yaml --- r: 168420 b: refs/heads/master c:
 109f55651954def97fa41ee71c464d268c512ab0 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/fs/ext4/extents.c |  1 +
 trunk/fs/ext4/inode.c   | 10 +++++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ab812b19ec55..fe2115b7d49a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa5d11133b07053270e18fa9c18560e66e79217e
+refs/heads/master: 109f55651954def97fa41ee71c464d268c512ab0
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 10539e364283..441716f33b4a 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -3519,6 +3519,7 @@ long ext4_fallocate(struct inode *inode, int mode, loff_t offset, loff_t len)
  *
  * This function is called from the direct IO end io call back
  * function, to convert the fallocated extents after IO is completed.
+ * Returns 0 on success.
  */
 int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset,
 				    loff_t len)
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index d1ec698a91d1..12d727f8fedf 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -3772,13 +3772,17 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
 		if (ret != -EIOCBQUEUED && ret <= 0 && iocb->private) {
 			ext4_free_io_end(iocb->private);
 			iocb->private = NULL;
-		} else if (ret > 0)
+		} else if (ret > 0) {
+			int err;
 			/*
 			 * for non AIO case, since the IO is already
 			 * completed, we could do the convertion right here
 			 */
-			ret = ext4_convert_unwritten_extents(inode,
-								offset, ret);
+			err = ext4_convert_unwritten_extents(inode,
+							     offset, ret);
+			if (err < 0)
+				ret = err;
+		}
 		return ret;
 	}