summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2015-03-07 22:08:46 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-08 20:53:46 +0100
commit1711fd9addf214823b993468567cab1f8254fc51 (patch)
tree4b950dc5f99bd1895e4e5a6a2abb6a7b5a892c5c /net
parentMerge tag 'usb-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff)
downloadlinux-1711fd9addf214823b993468567cab1f8254fc51.tar.xz
linux-1711fd9addf214823b993468567cab1f8254fc51.zip
sunrpc: fix braino in ->poll()
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: stable@vger.kernel.org Cc: Bruce Fields <bfields@fieldses.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-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 33fb105d4352..5199bb1a017e 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -921,7 +921,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;