diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/lockd/clntproc.c | 10 | ||||
-rw-r--r-- | fs/nfsd/lockd.c | 13 |
2 files changed, 18 insertions, 5 deletions
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c index 1f6dc518505c..31668b690e03 100644 --- a/fs/lockd/clntproc.c +++ b/fs/lockd/clntproc.c | |||
@@ -582,7 +582,15 @@ again: | |||
582 | } | 582 | } |
583 | if (status < 0) | 583 | if (status < 0) |
584 | goto out_unlock; | 584 | goto out_unlock; |
585 | status = nlm_stat_to_errno(resp->status); | 585 | /* |
586 | * EAGAIN doesn't make sense for sleeping locks, and in some | ||
587 | * cases NLM_LCK_DENIED is returned for a permanent error. So | ||
588 | * turn it into an ENOLCK. | ||
589 | */ | ||
590 | if (resp->status == nlm_lck_denied && (fl_flags & FL_SLEEP)) | ||
591 | status = -ENOLCK; | ||
592 | else | ||
593 | status = nlm_stat_to_errno(resp->status); | ||
586 | out_unblock: | 594 | out_unblock: |
587 | nlmclnt_finish_block(block); | 595 | nlmclnt_finish_block(block); |
588 | out: | 596 | out: |
diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c index 6b6225ac4926..15c6faeec77c 100644 --- a/fs/nfsd/lockd.c +++ b/fs/nfsd/lockd.c | |||
@@ -19,6 +19,13 @@ | |||
19 | 19 | ||
20 | #define NFSDDBG_FACILITY NFSDDBG_LOCKD | 20 | #define NFSDDBG_FACILITY NFSDDBG_LOCKD |
21 | 21 | ||
22 | #ifdef CONFIG_LOCKD_V4 | ||
23 | #define nlm_stale_fh nlm4_stale_fh | ||
24 | #define nlm_failed nlm4_failed | ||
25 | #else | ||
26 | #define nlm_stale_fh nlm_lck_denied_nolocks | ||
27 | #define nlm_failed nlm_lck_denied_nolocks | ||
28 | #endif | ||
22 | /* | 29 | /* |
23 | * Note: we hold the dentry use count while the file is open. | 30 | * Note: we hold the dentry use count while the file is open. |
24 | */ | 31 | */ |
@@ -47,12 +54,10 @@ nlm_fopen(struct svc_rqst *rqstp, struct nfs_fh *f, struct file **filp) | |||
47 | return 0; | 54 | return 0; |
48 | case nfserr_dropit: | 55 | case nfserr_dropit: |
49 | return nlm_drop_reply; | 56 | return nlm_drop_reply; |
50 | #ifdef CONFIG_LOCKD_V4 | ||
51 | case nfserr_stale: | 57 | case nfserr_stale: |
52 | return nlm4_stale_fh; | 58 | return nlm_stale_fh; |
53 | #endif | ||
54 | default: | 59 | default: |
55 | return nlm_lck_denied; | 60 | return nlm_failed; |
56 | } | 61 | } |
57 | } | 62 | } |
58 | 63 | ||