diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:45 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:45 -0500 |
commit | 95d35cb4c473c754824967c0b069bbeb7efa4847 (patch) | |
tree | bd46a5b0e4d35f9256cf44ca2706493fc3dd2819 /fs/nfs/nfs4renewd.c | |
parent | 19e03c570e6099ffaf24e5628d4fe1a8acbe820d (diff) |
NFSv4: Remove nfs_client->cl_sem
Now that we're using the flags to indicate state that needs to be
recovered, as well as having implemented proper refcounting and spinlocking
on the state and open_owners, we can get rid of nfs_client->cl_sem. The
only remaining case that was dubious was the file locking, and that case is
now covered by the nfsi->rwsem.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4renewd.c')
-rw-r--r-- | fs/nfs/nfs4renewd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c index 9fe8640a88eb..6101f955f231 100644 --- a/fs/nfs/nfs4renewd.c +++ b/fs/nfs/nfs4renewd.c | |||
@@ -65,7 +65,6 @@ nfs4_renew_state(struct work_struct *work) | |||
65 | long lease, timeout; | 65 | long lease, timeout; |
66 | unsigned long last, now; | 66 | unsigned long last, now; |
67 | 67 | ||
68 | down_read(&clp->cl_sem); | ||
69 | dprintk("%s: start\n", __func__); | 68 | dprintk("%s: start\n", __func__); |
70 | /* Are there any active superblocks? */ | 69 | /* Are there any active superblocks? */ |
71 | if (list_empty(&clp->cl_superblocks)) | 70 | if (list_empty(&clp->cl_superblocks)) |
@@ -101,11 +100,9 @@ nfs4_renew_state(struct work_struct *work) | |||
101 | schedule_delayed_work(&clp->cl_renewd, timeout); | 100 | schedule_delayed_work(&clp->cl_renewd, timeout); |
102 | spin_unlock(&clp->cl_lock); | 101 | spin_unlock(&clp->cl_lock); |
103 | out: | 102 | out: |
104 | up_read(&clp->cl_sem); | ||
105 | dprintk("%s: done\n", __func__); | 103 | dprintk("%s: done\n", __func__); |
106 | } | 104 | } |
107 | 105 | ||
108 | /* Must be called with clp->cl_sem locked for writes */ | ||
109 | void | 106 | void |
110 | nfs4_schedule_state_renewal(struct nfs_client *clp) | 107 | nfs4_schedule_state_renewal(struct nfs_client *clp) |
111 | { | 108 | { |