summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorAlexandros Batsakis <batsakis@netapp.com>2010-02-05 03:45:06 -0800
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-03-02 13:00:03 -0500
commit0851de06174e9800e76b26e4be0ca94294c09c8c (patch)
tree4049cd2aaa462eb0f4d206d3f8a07afa13f2c96d /fs/nfs
parent7135840fc74699513d50e0c9c64922f2d38aa5e3 (diff)
downloadlinux-3.10-0851de06174e9800e76b26e4be0ca94294c09c8c.tar.gz
linux-3.10-0851de06174e9800e76b26e4be0ca94294c09c8c.tar.bz2
linux-3.10-0851de06174e9800e76b26e4be0ca94294c09c8c.zip
nfs4: renewd renew operations should take/put a client reference
renewd sends RENEW requests to the NFS server in order to renew state. As the request is asynchronous, renewd should take a reference to the nfs_client to prevent concurrent umounts from freeing the client Signed-off-by: Alexandros Batsakis <batsakis@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 663ae0c3683..68f1fe00c08 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3152,7 +3152,9 @@ static void nfs4_renew_release(void *data)
{
struct nfs_client *clp = data;
- nfs4_schedule_state_renewal(clp);
+ if (atomic_read(&clp->cl_count) > 1)
+ nfs4_schedule_state_renewal(clp);
+ nfs_put_client(clp);
}
static void nfs4_renew_done(struct rpc_task *task, void *data)
@@ -3185,6 +3187,8 @@ int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred)
.rpc_cred = cred,
};
+ if (!atomic_inc_not_zero(&clp->cl_count))
+ return -EIO;
return rpc_call_async(clp->cl_rpcclient, &msg, RPC_TASK_SOFT,
&nfs4_renew_ops, clp);
}