---

yaml --- r: 349349 b: refs/heads/master c: f2a4595 h: refs/heads/master i: 349347: 90d02ea v: v3
git-mirror · Jan 28, 2013 · b5f5f23 · b5f5f23
1 parent 35b65a9
commit b5f5f23
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb178619f930fa2ba2348de332a1ff1c66a31424
+refs/heads/master: f2a459565b02b60408f3f2e5ca992a031319712b
diff --git a/trunk/fs/xfs/xfs_iomap.c b/trunk/fs/xfs/xfs_iomap.c
@@ -351,6 +351,15 @@ xfs_iomap_prealloc_size(
 		}
 		if (shift)
 			alloc_blocks >>= shift;
+
+		/*
+		 * If we are still trying to allocate more space than is
+		 * available, squash the prealloc hard. This can happen if we
+		 * have a large file on a small filesystem and the above
+		 * lowspace thresholds are smaller than MAXEXTLEN.
+		 */
+		while (alloc_blocks >= freesp)
+			alloc_blocks >>= 4;
 	}
 
 	if (alloc_blocks < mp->m_writeio_blocks)