Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933683AbbFPJSt (ORCPT ); Tue, 16 Jun 2015 05:18:49 -0400 Received: from mail.kernel.org ([198.145.29.136]:55631 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756161AbbFPIor (ORCPT ); Tue, 16 Jun 2015 04:44:47 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Al Viro , Al Viro , Bruce Fields , Linus Torvalds , Zefan Li Subject: [PATCH 3.4 080/172] sunrpc: fix braino in ->poll() Date: Tue, 16 Jun 2015 16:35:34 +0800 Message-Id: <1434443826-4929-80-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434443587-4599-1-git-send-email-lizf@kernel.org> References: <1434443587-4599-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1250 Lines: 42 From: Al Viro 3.4.108-rc1 review patch. If anyone has any objections, please let me know. ------------------ 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 Cc: Bruce Fields Signed-off-by: Linus Torvalds Signed-off-by: Zefan Li --- net/sunrpc/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 76cb304..af4dd9e 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -911,7 +911,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; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/