diff options
Diffstat (limited to 'fs/lockd/clntproc.c')
-rw-r--r-- | fs/lockd/clntproc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 332c54cf75e0..adb45ec9038c 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
@@ -58,7 +58,7 @@ static void nlm_put_lockowner(struct nlm_lockowner *lockowner) | |||
58 | return; | 58 | return; |
59 | list_del(&lockowner->list); | 59 | list_del(&lockowner->list); |
60 | spin_unlock(&lockowner->host->h_lock); | 60 | spin_unlock(&lockowner->host->h_lock); |
61 | nlm_release_host(lockowner->host); | 61 | nlmclnt_release_host(lockowner->host); |
62 | kfree(lockowner); | 62 | kfree(lockowner); |
63 | } | 63 | } |
64 | 64 | ||
@@ -207,22 +207,22 @@ struct nlm_rqst *nlm_alloc_call(struct nlm_host *host) | |||
207 | printk("nlm_alloc_call: failed, waiting for memory\n"); | 207 | printk("nlm_alloc_call: failed, waiting for memory\n"); |
208 | schedule_timeout_interruptible(5*HZ); | 208 | schedule_timeout_interruptible(5*HZ); |
209 | } | 209 | } |
210 | nlm_release_host(host); | 210 | nlmclnt_release_host(host); |
211 | return NULL; | 211 | return NULL; |
212 | } | 212 | } |
213 | 213 | ||
214 | void nlm_release_call(struct nlm_rqst *call) | 214 | void nlmclnt_release_call(struct nlm_rqst *call) |
215 | { | 215 | { |
216 | if (!atomic_dec_and_test(&call->a_count)) | 216 | if (!atomic_dec_and_test(&call->a_count)) |
217 | return; | 217 | return; |
218 | nlm_release_host(call->a_host); | 218 | nlmclnt_release_host(call->a_host); |
219 | nlmclnt_release_lockargs(call); | 219 | nlmclnt_release_lockargs(call); |
220 | kfree(call); | 220 | kfree(call); |
221 | } | 221 | } |
222 | 222 | ||
223 | static void nlmclnt_rpc_release(void *data) | 223 | static void nlmclnt_rpc_release(void *data) |
224 | { | 224 | { |
225 | nlm_release_call(data); | 225 | nlmclnt_release_call(data); |
226 | } | 226 | } |
227 | 227 | ||
228 | static int nlm_wait_on_grace(wait_queue_head_t *queue) | 228 | static int nlm_wait_on_grace(wait_queue_head_t *queue) |
@@ -436,7 +436,7 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl) | |||
436 | status = nlm_stat_to_errno(req->a_res.status); | 436 | status = nlm_stat_to_errno(req->a_res.status); |
437 | } | 437 | } |
438 | out: | 438 | out: |
439 | nlm_release_call(req); | 439 | nlmclnt_release_call(req); |
440 | return status; | 440 | return status; |
441 | } | 441 | } |
442 | 442 | ||
@@ -593,7 +593,7 @@ again: | |||
593 | out_unblock: | 593 | out_unblock: |
594 | nlmclnt_finish_block(block); | 594 | nlmclnt_finish_block(block); |
595 | out: | 595 | out: |
596 | nlm_release_call(req); | 596 | nlmclnt_release_call(req); |
597 | return status; | 597 | return status; |
598 | out_unlock: | 598 | out_unlock: |
599 | /* Fatal error: ensure that we remove the lock altogether */ | 599 | /* Fatal error: ensure that we remove the lock altogether */ |
@@ -694,7 +694,7 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl) | |||
694 | /* What to do now? I'm out of my depth... */ | 694 | /* What to do now? I'm out of my depth... */ |
695 | status = -ENOLCK; | 695 | status = -ENOLCK; |
696 | out: | 696 | out: |
697 | nlm_release_call(req); | 697 | nlmclnt_release_call(req); |
698 | return status; | 698 | return status; |
699 | } | 699 | } |
700 | 700 | ||
@@ -755,7 +755,7 @@ static int nlmclnt_cancel(struct nlm_host *host, int block, struct file_lock *fl | |||
755 | NLMPROC_CANCEL, &nlmclnt_cancel_ops); | 755 | NLMPROC_CANCEL, &nlmclnt_cancel_ops); |
756 | if (status == 0 && req->a_res.status == nlm_lck_denied) | 756 | if (status == 0 && req->a_res.status == nlm_lck_denied) |
757 | status = -ENOLCK; | 757 | status = -ENOLCK; |
758 | nlm_release_call(req); | 758 | nlmclnt_release_call(req); |
759 | return status; | 759 | return status; |
760 | } | 760 | } |
761 | 761 | ||