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 | 7cab89b275fd5647e72b781ac41b58a214640334 (diff) | |
| parent | 480e3243df156e39eea6c91057e2ae612a6bbe19 (diff) | |
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) | |||
| 485 | dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid, | 485 | dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid, |
| 486 | cred->cr_uid); | 486 | cred->cr_uid); |
| 487 | gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred); | 487 | gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred); |
| 488 | if (IS_ERR(gss_msg) == -EAGAIN) { | 488 | if (PTR_ERR(gss_msg) == -EAGAIN) { |
| 489 | /* XXX: warning on the first, under the assumption we | 489 | /* XXX: warning on the first, under the assumption we |
| 490 | * shouldn't normally hit this case on a refresh. */ | 490 | * shouldn't normally hit this case on a refresh. */ |
| 491 | warn_gssd(); | 491 | warn_gssd(); |