public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
@ 2009-12-07 11:34 Roel Kluin
  2009-12-07 15:26 ` J. Bruce Fields
  0 siblings, 1 reply; 6+ messages in thread
From: Roel Kluin @ 2009-12-07 11:34 UTC (permalink / raw)
  To: J. Bruce Fields, Neil Brown, linux-nfs, Andrew Morton, LKML

IS_ERR returns 1 or 0, PTR_ERR returns the error value.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
 net/sunrpc/auth_gss/auth_gss.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index fc6a43c..129d75e 100644
--- 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();

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
  2009-12-07 11:34 [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion Roel Kluin
@ 2009-12-07 15:26 ` J. Bruce Fields
  2009-12-07 23:04   ` Trond Myklebust
  0 siblings, 1 reply; 6+ messages in thread
From: J. Bruce Fields @ 2009-12-07 15:26 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: Neil Brown, linux-nfs, Andrew Morton, LKML, Roel Kluin

On Mon, Dec 07, 2009 at 12:34:28PM +0100, Roel Kluin wrote:
> IS_ERR returns 1 or 0, PTR_ERR returns the error value.

Whoops, thanks, looks like that was my mistake, from
79a3f20b641f9f93787ada49d1d7cfa98ee5a11e "rpc: use count of pipe openers
to wait for first open".

--b.

> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
> ---
>  net/sunrpc/auth_gss/auth_gss.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
> index fc6a43c..129d75e 100644
> --- 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();

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
  2009-12-07 15:26 ` J. Bruce Fields
@ 2009-12-07 23:04   ` Trond Myklebust
  2009-12-07 23:06     ` Trond Myklebust
  2009-12-07 23:07     ` J. Bruce Fields
  0 siblings, 2 replies; 6+ messages in thread
From: Trond Myklebust @ 2009-12-07 23:04 UTC (permalink / raw)
  To: J. Bruce Fields; +Cc: Neil Brown, linux-nfs, Andrew Morton, LKML, Roel Kluin

On Mon, 2009-12-07 at 10:26 -0500, J. Bruce Fields wrote: 
> On Mon, Dec 07, 2009 at 12:34:28PM +0100, Roel Kluin wrote:
> > IS_ERR returns 1 or 0, PTR_ERR returns the error value.
> 
> Whoops, thanks, looks like that was my mistake, from
> 79a3f20b641f9f93787ada49d1d7cfa98ee5a11e "rpc: use count of pipe openers
> to wait for first open".

Are you planning on shepherding this fix into mainline, or should I?

Trond

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
  2009-12-07 23:04   ` Trond Myklebust
@ 2009-12-07 23:06     ` Trond Myklebust
  2009-12-07 23:07     ` J. Bruce Fields
  1 sibling, 0 replies; 6+ messages in thread
From: Trond Myklebust @ 2009-12-07 23:06 UTC (permalink / raw)
  To: J. Bruce Fields; +Cc: Neil Brown, linux-nfs, Andrew Morton, LKML, Roel Kluin

On Mon, 2009-12-07 at 18:04 -0500, Trond Myklebust wrote: 
> On Mon, 2009-12-07 at 10:26 -0500, J. Bruce Fields wrote: 
> > On Mon, Dec 07, 2009 at 12:34:28PM +0100, Roel Kluin wrote:
> > > IS_ERR returns 1 or 0, PTR_ERR returns the error value.
> > 
> > Whoops, thanks, looks like that was my mistake, from
> > 79a3f20b641f9f93787ada49d1d7cfa98ee5a11e "rpc: use count of pipe openers
> > to wait for first open".
> 
> Are you planning on shepherding this fix into mainline, or should I?
> 
> Trond

BTW: It should probably be labelled as 'Cc: stable@kernel.org' since it
appears to be a 2.6.29 bug...

Trond

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
  2009-12-07 23:04   ` Trond Myklebust
  2009-12-07 23:06     ` Trond Myklebust
@ 2009-12-07 23:07     ` J. Bruce Fields
  2009-12-07 23:12       ` Trond Myklebust
  1 sibling, 1 reply; 6+ messages in thread
From: J. Bruce Fields @ 2009-12-07 23:07 UTC (permalink / raw)
  To: Trond Myklebust; +Cc: Neil Brown, linux-nfs, Andrew Morton, LKML, Roel Kluin

On Mon, Dec 07, 2009 at 06:04:19PM -0500, Trond Myklebust wrote:
> On Mon, 2009-12-07 at 10:26 -0500, J. Bruce Fields wrote: 
> > On Mon, Dec 07, 2009 at 12:34:28PM +0100, Roel Kluin wrote:
> > > IS_ERR returns 1 or 0, PTR_ERR returns the error value.
> > 
> > Whoops, thanks, looks like that was my mistake, from
> > 79a3f20b641f9f93787ada49d1d7cfa98ee5a11e "rpc: use count of pipe openers
> > to wait for first open".
> 
> Are you planning on shepherding this fix into mainline, or should I?

I don't care, but I think of that as client-side code, so I'm assuming
you're taking it.

--b.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion
  2009-12-07 23:07     ` J. Bruce Fields
@ 2009-12-07 23:12       ` Trond Myklebust
  0 siblings, 0 replies; 6+ messages in thread
From: Trond Myklebust @ 2009-12-07 23:12 UTC (permalink / raw)
  To: J. Bruce Fields; +Cc: Neil Brown, linux-nfs, Andrew Morton, LKML, Roel Kluin

On Mon, 2009-12-07 at 18:07 -0500, J. Bruce Fields wrote: 
> On Mon, Dec 07, 2009 at 06:04:19PM -0500, Trond Myklebust wrote:
> > Are you planning on shepherding this fix into mainline, or should I?
> 
> I don't care, but I think of that as client-side code, so I'm assuming
> you're taking it.


OK. Will do...

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-12-07 23:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-07 11:34 [PATCH] SUNRPC: IS_ERR/PTR_ERR confusion Roel Kluin
2009-12-07 15:26 ` J. Bruce Fields
2009-12-07 23:04   ` Trond Myklebust
2009-12-07 23:06     ` Trond Myklebust
2009-12-07 23:07     ` J. Bruce Fields
2009-12-07 23:12       ` Trond Myklebust

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox