---

yaml --- r: 109899 b: refs/heads/master c: 364f358 h: refs/heads/master i: 109897: 54c5f38 109895: 049ffed v: v3
git-mirror · Sep 17, 2008 · a20753a · a20753a
1 parent 9088e45
commit a20753a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6efdf281777eb07fac28ac2b2d7df1e619ee6da1
+refs/heads/master: 364f358a734ddcd827c662ccbfa58ee3ac510762
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -1338,6 +1338,10 @@ __xfs_get_blocks(
 	offset = (xfs_off_t)iblock << inode->i_blkbits;
 	ASSERT(bh_result->b_size >= (1 << inode->i_blkbits));
 	size = bh_result->b_size;
+
+	if (!create && direct && offset >= i_size_read(inode))
+		return 0;
+
 	error = xfs_iomap(XFS_I(inode), offset, size,
 			     create ? flags : BMAPI_READ, &iomap, &niomap);
 	if (error)