aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd/svclock.c
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-12-14 10:05:42 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-12-16 12:37:26 -0500
commit7db836d4a427c3c64406b00b6d8d745d6335d72a (patch)
tree63f1ae586db1945badf8a65e34f49113a4981c5e /fs/lockd/svclock.c
parent723bb5b5052faba57060a2feb564ced22416b5bc (diff)
lockd: Split nlm_release_call()
The nlm_release_call() function is invoked from both the server and the client side. We're about to introduce a distinct server- and client-side nlm_release_host(), so nlm_release_call() must first be split into a client-side and a server-side version. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/svclock.c')
-rw-r--r--fs/lockd/svclock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 9266c4600208..6e31695d046f 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -234,7 +234,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,
234failed_free: 234failed_free:
235 kfree(block); 235 kfree(block);
236failed: 236failed:
237 nlm_release_call(call); 237 nlmsvc_release_call(call);
238 return NULL; 238 return NULL;
239} 239}
240 240
@@ -267,7 +267,7 @@ static void nlmsvc_free_block(struct kref *kref)
267 mutex_unlock(&file->f_mutex); 267 mutex_unlock(&file->f_mutex);
268 268
269 nlmsvc_freegrantargs(block->b_call); 269 nlmsvc_freegrantargs(block->b_call);
270 nlm_release_call(block->b_call); 270 nlmsvc_release_call(block->b_call);
271 nlm_release_file(block->b_file); 271 nlm_release_file(block->b_file);
272 kfree(block->b_fl); 272 kfree(block->b_fl);
273 kfree(block); 273 kfree(block);