Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763577AbZLQBpJ (ORCPT ); Wed, 16 Dec 2009 20:45:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758668AbZLQBoo (ORCPT ); Wed, 16 Dec 2009 20:44:44 -0500 Received: from kroah.org ([198.145.64.141]:47820 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763592AbZLQBUC (ORCPT ); Wed, 16 Dec 2009 20:20:02 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Wed Dec 16 17:16:00 2009 Message-Id: <20091217011600.472766906@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 16 Dec 2009 17:14:31 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Roel Kluin , Trond Myklebust Subject: [20/90] SUNRPC: IS_ERR/PTR_ERR confusion In-Reply-To: <20091217011835.GA20434@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1251 Lines: 30 2.6.31-stable review patch. If anyone has any objections, please let us know. ------------------ From: Roel Kluin commit 480e3243df156e39eea6c91057e2ae612a6bbe19 upstream. IS_ERR returns 1 or 0, PTR_ERR returns the error value. Signed-off-by: Roel Kluin Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/auth_gss/auth_gss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c @@ -485,7 +485,7 @@ gss_refresh_upcall(struct rpc_task *task dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid, cred->cr_uid); gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred); - if (IS_ERR(gss_msg) == -EAGAIN) { + if (PTR_ERR(gss_msg) == -EAGAIN) { /* XXX: warning on the first, under the assumption we * shouldn't normally hit this case on a refresh. */ warn_gssd(); -- 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/