---

yaml --- r: 352923 b: refs/heads/master c: 4d559a3 h: refs/heads/master i: 352921: 6e87681 352919: 3e9b0e8 v: v3
git-mirror · Jan 24, 2013 · 711f48d · 711f48d
1 parent 41e5888
commit 711f48d
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: 10616b806d1d7835b1d23b8d75ef638f92cb98b6
+refs/heads/master: 4d559a3bcb7383f34334092af07e68fb60910684
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)