diff options
| author |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-08 14:36:53 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-08 14:36:53 -0500 |
| commit | e4ee5d4dfd9536ec60e5cb0bd439ede3e9d361a0 (patch) | |
| tree | ea154524598a31134835a6be0843caf8310b06a0 /net | |
| parent | nfs41: Invoke RECLAIM_COMPLETE on all new client ids (diff) | |
| parent | SUNRPC: IS_ERR/PTR_ERR confusion (diff) | |
| download | linux-dev-e4ee5d4dfd9536ec60e5cb0bd439ede3e9d361a0.tar.xz linux-dev-e4ee5d4dfd9536ec60e5cb0bd439ede3e9d361a0.zip | |
Merge branch 'bugfixes' into nfs-for-next
Diffstat (limited to 'net')
| -rw-r--r-- | 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 fc6a43ccd950..129d75ea25d2 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(); |