git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
fs
/
xfs
/
linux-2.6
/
xfs_buf.c
diff --git
a/fs/xfs/linux-2.6/xfs_buf.c
b/fs/xfs/linux-2.6/xfs_buf.c
index
0c93c7e
..
965df12
100644
(file)
--- a/
fs/xfs/linux-2.6/xfs_buf.c
+++ b/
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;