FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-14 04:41:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lockd: get host reference in nlmsvc_create_block() instead of callers

Browse Source 
It may not be obvious (till you look at the definition of
nlm_alloc_call()) that a function like nlmsvc_create_block() should
consume a reference on success or failure, so I find it clearer if it
takes the reference it needs itself.

And both callers already do this immediately before the call anyway.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2008-07-15 15:05:45 -04:00
parent 6d7bbbbacc
commit 560de0e659
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/lockd/svclock.c
View File

@ -180,6 +180,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,
struct nlm_block *block; struct nlm_block *block;
struct nlm_rqst *call = NULL; struct nlm_rqst *call = NULL;
nlm_get_host(host);
call = nlm_alloc_call(host); call = nlm_alloc_call(host);
if (call == NULL) if (call == NULL)
return NULL; return NULL;
@ -380,8 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
*/ */
block = nlmsvc_lookup_block(file, lock); block = nlmsvc_lookup_block(file, lock);
if (block == NULL) { if (block == NULL) {
block = nlmsvc_create_block(rqstp, nlm_get_host(host), file, block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
lock, cookie);
ret = nlm_lck_denied_nolocks; ret = nlm_lck_denied_nolocks;
if (block == NULL) if (block == NULL)
goto out; goto out;
@ -476,7 +476,6 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
if (conf == NULL) if (conf == NULL)
return nlm_granted; return nlm_granted;
nlm_get_host(host);
block = nlmsvc_create_block(rqstp, host, file, lock, cookie); block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
if (block == NULL) { if (block == NULL) {
kfree(conf); kfree(conf);