---

yaml --- r: 282958 b: refs/heads/master c: 8c48f7e h: refs/heads/master v: v3
git-mirror · Dec 19, 2011 · 5172af1 · 5172af1
1 parent d1372f1
commit 5172af1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;