aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/lockd/svclock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index bcf73f6e8226..51a0dea0ae8a 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -129,9 +129,9 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock)
129 129
130static inline int nlm_cookie_match(struct nlm_cookie *a, struct nlm_cookie *b) 130static inline int nlm_cookie_match(struct nlm_cookie *a, struct nlm_cookie *b)
131{ 131{
132 if(a->len != b->len) 132 if (a->len != b->len)
133 return 0; 133 return 0;
134 if(memcmp(a->data,b->data,a->len)) 134 if (memcmp(a->data, b->data, a->len))
135 return 0; 135 return 0;
136 return 1; 136 return 1;
137} 137}
@@ -381,7 +381,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
381 block = nlmsvc_lookup_block(file, lock); 381 block = nlmsvc_lookup_block(file, lock);
382 if (block == NULL) { 382 if (block == NULL) {
383 block = nlmsvc_create_block(rqstp, nlm_get_host(host), file, 383 block = nlmsvc_create_block(rqstp, nlm_get_host(host), file,
384 lock, cookie); 384 lock, cookie);
385 ret = nlm_lck_denied_nolocks; 385 ret = nlm_lck_denied_nolocks;
386 if (block == NULL) 386 if (block == NULL)
387 goto out; 387 goto out;
@@ -412,7 +412,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
412 lock->fl.fl_flags &= ~FL_SLEEP; 412 lock->fl.fl_flags &= ~FL_SLEEP;
413 413
414 dprintk("lockd: vfs_lock_file returned %d\n", error); 414 dprintk("lockd: vfs_lock_file returned %d\n", error);
415 switch(error) { 415 switch (error) {
416 case 0: 416 case 0:
417 ret = nlm_granted; 417 ret = nlm_granted;
418 goto out; 418 goto out;
@@ -880,7 +880,7 @@ nlmsvc_retry_blocked(void)
880 880
881 if (block->b_when == NLM_NEVER) 881 if (block->b_when == NLM_NEVER)
882 break; 882 break;
883 if (time_after(block->b_when,jiffies)) { 883 if (time_after(block->b_when, jiffies)) {
884 timeout = block->b_when - jiffies; 884 timeout = block->b_when - jiffies;
885 break; 885 break;
886 } 886 }