diff options
| author | J. Bruce Fields <bfields@fieldses.org> | 2006-01-03 09:55:42 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-01-06 20:58:53 +0100 |
| commit | f232142cc21127c829559923eb405d1bcb2e2278 (patch) | |
| tree | 4ac11e21c008a26b6e9e5ad3ac4db8b2920534a9 /fs/lockd/svclock.c | |
| parent | SUNRPC: net/sunrpc/xdr.c: remove xdr_decode_string() (diff) | |
| download | linux-f232142cc21127c829559923eb405d1bcb2e2278.tar.xz linux-f232142cc21127c829559923eb405d1bcb2e2278.zip | |
NLM: Clean up nlmsvc_grant_reply locking
Slightly simpler logic here makes it more trivial to verify that the up's
and down's are balanced here. Break out an assignment from a conditional
while we're at it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/lockd/svclock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 87d09a0d8f64..e42f0cc6c450 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -637,11 +637,12 @@ nlmsvc_grant_reply(struct svc_rqst *rqstp, struct nlm_cookie *cookie, u32 status file->f_count++; down(&file->f_sema); - if ((block = nlmsvc_find_block(cookie,&rqstp->rq_addr)) != NULL) { + block = nlmsvc_find_block(cookie, &rqstp->rq_addr); + if (block) { if (status == NLM_LCK_DENIED_GRACE_PERIOD) { /* Try again in a couple of seconds */ nlmsvc_insert_block(block, 10 * HZ); - block = NULL; + up(&file->f_sema); } else { /* Lock is now held by client, or has been rejected. * In both cases, the block should be removed. */ @@ -652,8 +653,6 @@ nlmsvc_grant_reply(struct svc_rqst *rqstp, struct nlm_cookie *cookie, u32 status nlmsvc_delete_block(block, 1); } } - if (!block) - up(&file->f_sema); nlm_release_file(file); } |