| Message ID | 1392066375-16502-1-git-send-email-steved@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Feb 10, 2014, at 16:06, Steve Dickson <steved@redhat.com> wrote: > [ Resent with Trond's correct email address ] > > Commit 0ea9de0e introduce a regression in the lease recovery code. > > An infinite loop is caused when nfs4_establish_lease() fails > with -EACCES. This causes nfs4_handle_reclaim_lease_error() > to sleep a bit and resets the NFS4CLNT_LEASE_EXPIRED bit. > This in turn causes nfs4_state_manager() to try and > reestablished the lease, again, again, again... > > The problem is a valid RPCSEC_GSS client is being created when > rpc.gssd is not running. This is causing the RPC code to fail > with the -EACCES sending the lease reestablished off the > deep end. > > Moving the gssd_running() check back into nfs4_init_client(), > stopping the RPCSEC_GSS client from being create, stops > the looping > > Signed-off-by: Steve Dickson <steved@redhat.com> > --- > fs/nfs/nfs4client.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c > index 860ad26..a60269f 100644 > --- a/fs/nfs/nfs4client.c > +++ b/fs/nfs/nfs4client.c > @@ -372,7 +372,10 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, > __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags); > __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags); > > - error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I); > + error = -EINVAL; > + if (gssd_running(clp->cl_net)) > + error = nfs_create_rpc_client(clp, timeparms, > + RPC_AUTH_GSS_KRB5I); > if (error == -EINVAL) > error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX); > if (error < 0) > -- > 1.7.1 > NACK. gssd_running() is not an acceptable solution outside of the RPC layer.
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 860ad26..a60269f 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -372,7 +372,10 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp, __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags); __set_bit(NFS_CS_NO_RETRANS_TIMEOUT, &clp->cl_flags); - error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I); + error = -EINVAL; + if (gssd_running(clp->cl_net)) + error = nfs_create_rpc_client(clp, timeparms, + RPC_AUTH_GSS_KRB5I); if (error == -EINVAL) error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX); if (error < 0)
[ Resent with Trond's correct email address ] Commit 0ea9de0e introduce a regression in the lease recovery code. An infinite loop is caused when nfs4_establish_lease() fails with -EACCES. This causes nfs4_handle_reclaim_lease_error() to sleep a bit and resets the NFS4CLNT_LEASE_EXPIRED bit. This in turn causes nfs4_state_manager() to try and reestablished the lease, again, again, again... The problem is a valid RPCSEC_GSS client is being created when rpc.gssd is not running. This is causing the RPC code to fail with the -EACCES sending the lease reestablished off the deep end. Moving the gssd_running() check back into nfs4_init_client(), stopping the RPCSEC_GSS client from being create, stops the looping Signed-off-by: Steve Dickson <steved@redhat.com> --- fs/nfs/nfs4client.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)