diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 10:30:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 10:30:19 -0800 |
| commit | 896abeb743579fc8be0d16d15d6768a158a3a109 (patch) | |
| tree | 8b5f6ce348ea00e5f67de8f67001fdbfd248de32 /fs | |
| parent | i915: Fix more size_t format string warnings (diff) | |
| parent | lockd: fix regression in lockd's handling of blocked locks (diff) | |
| download | linux-dev-896abeb743579fc8be0d16d15d6768a158a3a109.tar.xz linux-dev-896abeb743579fc8be0d16d15d6768a158a3a109.zip | |
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
lockd: fix regression in lockd's handling of blocked locks
Diffstat (limited to 'fs')
| -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 */ |