OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lockd: minor svclock.c style fixes 

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

10
fs/lockd/svclock.c
View File

@ -129,9 +129,9 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock)
static inline int nlm_cookie_match(struct nlm_cookie *a, struct nlm_cookie *b) static inline int nlm_cookie_match(struct nlm_cookie *a, struct nlm_cookie *b)
{ {
if(a->len != b->len) if (a->len != b->len)
return 0; return 0;
if(memcmp(a->data,b->data,a->len)) if (memcmp(a->data, b->data, a->len))
return 0; return 0;
return 1; return 1;
} }
@ -381,7 +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, nlm_get_host(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;
@ -412,7 +412,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
lock->fl.fl_flags &= ~FL_SLEEP; lock->fl.fl_flags &= ~FL_SLEEP;
dprintk("lockd: vfs_lock_file returned %d\n", error); dprintk("lockd: vfs_lock_file returned %d\n", error);
switch(error) { switch (error) {
case 0: case 0:
ret = nlm_granted; ret = nlm_granted;
goto out; goto out;
@ -880,7 +880,7 @@ nlmsvc_retry_blocked(void)
if (block->b_when == NLM_NEVER) if (block->b_when == NLM_NEVER)
break; break;
if (time_after(block->b_when,jiffies)) { if (time_after(block->b_when, jiffies)) {
timeout = block->b_when - jiffies; timeout = block->b_when - jiffies;
break; break;
} }