aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2015-03-07 21:08:46 +0000
committerBen Hutchings <ben@decadent.org.uk>2015-05-09 23:16:24 +0100
commit7e17502f742a8e8229ce706127ba2a52fa086ed3 (patch)
tree3ae7ae6657b2c8037d93d04b2db251fcb65ec144
parent0b6acc6c9ddce5f9b3a96f93c47378a9e4b58e47 (diff)
downloadkernel_samsung_smdk4412-7e17502f742a8e8229ce706127ba2a52fa086ed3.zip
kernel_samsung_smdk4412-7e17502f742a8e8229ce706127ba2a52fa086ed3.tar.gz
kernel_samsung_smdk4412-7e17502f742a8e8229ce706127ba2a52fa086ed3.tar.bz2
sunrpc: fix braino in ->poll()
commit 1711fd9addf214823b993468567cab1f8254fc51 upstream. POLL_OUT isn't what callers of ->poll() are expecting to see; it's actually __SI_POLL | 2 and it's a siginfo code, not a poll bitmap bit... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Bruce Fields <bfields@fieldses.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--net/sunrpc/cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 237a2ee..7de935a 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -909,7 +909,7 @@ static unsigned int cache_poll(struct file *filp, poll_table *wait,
poll_wait(filp, &queue_wait, wait);
/* alway allow write */
- mask = POLL_OUT | POLLWRNORM;
+ mask = POLLOUT | POLLWRNORM;
if (!rp)
return mask;