diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-12-24 01:33:04 +0000 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-06 14:57:46 -0500 |
| commit | d3978bb325510f0a26ebd92f211b36c5f98b2306 (patch) | |
| tree | 5d376fef966d242cb61df1bcfaefeec1e71663d4 /fs/nfs/nfs4renewd.c | |
| parent | dda4b225623f316335052828c24a16e2da313f8f (diff) | |
| download | op-kernel-dev-d3978bb325510f0a26ebd92f211b36c5f98b2306.zip op-kernel-dev-d3978bb325510f0a26ebd92f211b36c5f98b2306.tar.gz | |
NFS: Move cl_delegations to the nfs_server struct
Delegations are per-inode, not per-nfs_client. When a server file
system is migrated, delegations on the client must be moved from the
source to the destination nfs_server. Make it easier to manage a
mount point's delegation list across a migration event by moving the
list to the nfs_server struct.
Clean up: I added documenting comments to public functions I changed
in this patch. For consistency I added comments to all the other
public functions in fs/nfs/delegation.c.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4renewd.c')
| -rw-r--r-- | fs/nfs/nfs4renewd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c index cde5650..402143d 100644 --- a/fs/nfs/nfs4renewd.c +++ b/fs/nfs/nfs4renewd.c @@ -80,7 +80,7 @@ nfs4_renew_state(struct work_struct *work) cred = ops->get_state_renewal_cred_locked(clp); spin_unlock(&clp->cl_lock); if (cred == NULL) { - if (list_empty(&clp->cl_delegations)) { + if (!nfs_delegations_present(clp)) { set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state); goto out; } |
