From 5172af1e1ab64ddcf03726fbc5f817acf76c6fa0 Mon Sep 17 00:00:00 2001
From: Robin Dong <sanbai@taobao.com>
Date: Sun, 18 Dec 2011 23:05:43 -0500
Subject: [PATCH] --- yaml --- r: 282958 b: refs/heads/master c:
 8c48f7e88e293b9dd422bd8884842aea85d30b22 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 86dc5452cd1d..f4e2b8d57abc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14d7f3efe923bc60839c65f9818793c64b4d708b
+refs/heads/master: 8c48f7e88e293b9dd422bd8884842aea85d30b22
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
index 4423b11476af..5684f2510921 100644
--- a/trunk/fs/ext4/extents.c
+++ b/trunk/fs/ext4/extents.c
@@ -3281,6 +3281,9 @@ static int ext4_find_delalloc_range(struct inode *inode,
 	ext4_lblk_t i, pg_lblk;
 	pgoff_t index;
 
+	if (!test_opt(inode->i_sb, DELALLOC))
+		return 0;
+
 	/* reverse search wont work if fs block size is less than page size */
 	if (inode->i_blkbits < PAGE_CACHE_SHIFT)
 		search_hint_reverse = 0;