Merge branch 'bugfixes' into nfs-for-next

This commit is contained in:
Trond Myklebust 2009-12-08 14:36:53 -05:00
commit e4ee5d4dfd

View file

@ -485,7 +485,7 @@ gss_refresh_upcall(struct rpc_task *task)
dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid, dprintk("RPC: %5u gss_refresh_upcall for uid %u\n", task->tk_pid,
cred->cr_uid); cred->cr_uid);
gss_msg = gss_setup_upcall(task->tk_client, gss_auth, cred); 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 /* XXX: warning on the first, under the assumption we
* shouldn't normally hit this case on a refresh. */ * shouldn't normally hit this case on a refresh. */
warn_gssd(); warn_gssd();