---

yaml --- r: 156676 b: refs/heads/master c: 36fae17 h: refs/heads/master v: v3
git-mirror · Aug 12, 2009 · 3da80e9 · 3da80e9
1 parent 720e74d
commit 3da80e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f52c2f0a07c23771909cc53f2e9451a7f1bf253
+refs/heads/master: 36fae17a648e0aee5d9560514d08477ef48dc87f
diff --git a/trunk/fs/xfs/linux-2.6/xfs_buf.c b/trunk/fs/xfs/linux-2.6/xfs_buf.c
@@ -770,7 +770,7 @@ xfs_buf_associate_memory(
 	bp->b_pages = NULL;
 	bp->b_addr = mem;
 
-	rval = _xfs_buf_get_pages(bp, page_count, 0);
+	rval = _xfs_buf_get_pages(bp, page_count, XBF_DONT_BLOCK);
 	if (rval)
 		return rval;