git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
RPC/RDMA: ensure connection attempt is complete before signalling.
[safe/jmp/linux-2.6]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index
b30311b
..
1bbc6f4
100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-371,7
+371,7
@@
__generic_file_splice_read(struct file *in, loff_t *ppos,
* for an in-flight io page
*/
if (flags & SPLICE_F_NONBLOCK) {
- if (
TestSetPageLocked
(page)) {
+ if (
!trylock_page
(page)) {
error = -EAGAIN;
break;
}