projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Bluetooth: Permit BT_SECURITY also for L2CAP raw sockets
[linux-2.6]
/
fs
/
lockd
/
svclock.c
diff --git
a/fs/lockd/svclock.c
b/fs/lockd/svclock.c
index
6063a8e
..
763b78a
100644
(file)
--- a/
fs/lockd/svclock.c
+++ b/
fs/lockd/svclock.c
@@
-427,7
+427,7
@@
nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
goto out;
case -EAGAIN:
ret = nlm_lck_denied;
-
goto out
;
+
break
;
case FILE_LOCK_DEFERRED:
if (wait)
break;
@@
-443,6
+443,10
@@
nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
goto out;
}
+ ret = nlm_lck_denied;
+ if (!wait)
+ goto out;
+
ret = nlm_lck_blocked;
/* Append to list of blocked */