diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
| commit | f9915bfef3c64ea0b0b960dd1b999b584a7ef460 (patch) | |
| tree | ec8d1c35a542e4c8e08b5a2be380b2bdef9a10d0 /fs/lockd/svclock.c | |
| parent | b91facc367366b3f71375f337eb5997ec9ab4e69 (diff) | |
| parent | acd895795d35d7c6405f20301a846d16998795ec (diff) | |
| download | blackbird-op-linux-f9915bfef3c64ea0b0b960dd1b999b584a7ef460.tar.gz blackbird-op-linux-f9915bfef3c64ea0b0b960dd1b999b584a7ef460.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index 6063a8e4b9f3..763b78a6e9de 100644 --- 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 */ |
