[PATCH 1/2] direct IO returns value fix for holes/fallocate

[PATCH 1/2] direct IO returns value fix for holes/fallocate

[Mingming]

ext4: Direct IO return value fix for holes/fallocate

When direct IO complete, ext4 will convert unwritten extents to written, for
writes over preallocated space, or holes.

ext4_direct_IO should returns the number of bytes read/write on success.
However there is a bug that cause ext4_direct_IO returns the number of
bytes converted to written extents, which is 0 on success. This bug causes
direct IO falls back to buffered IO even on sucessful rewrites or
preallocated space.

Bug is reported by Curt Wohlgemuth <curtw@google.com>, and verified the following
patch fixed it the issue.

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
---
 fs/ext4/extents.c |    1 +
 fs/ext4/inode.c   |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

Index: linux-2.6.31-rc4/fs/ext4/extents.c
===================================================================
--- linux-2.6.31-rc4.orig/fs/ext4/extents.c
+++ linux-2.6.31-rc4/fs/ext4/extents.c
@@ -3500,6 +3500,7 @@ retry:
  *
  * 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)
Index: linux-2.6.31-rc4/fs/ext4/inode.c
===================================================================
--- linux-2.6.31-rc4.orig/fs/ext4/inode.c
+++ linux-2.6.31-rc4/fs/ext4/inode.c
@@ -3693,13 +3693,17 @@ static ssize_t ext4_ext_direct_IO(int rw
 		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,
+			err = ext4_convert_unwritten_extents(inode,
 								offset, ret);
+			if (err < 0)
+				ret = err;
+		}
 		return ret;
 	}