diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-13 06:30:28 +0200 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-10-17 16:14:14 +0200 |
commit | cd0b16c1c3cda12dbed1f8de8f1a9b0591990724 (patch) | |
tree | 16ef9e6b6b7ac0ee3f6113194e2732504c2f670f /fs/lockd/clntxdr.c | |
parent | Linux 3.7-rc1 (diff) | |
download | linux-cd0b16c1c3cda12dbed1f8de8f1a9b0591990724.tar.xz linux-cd0b16c1c3cda12dbed1f8de8f1a9b0591990724.zip |
NLM: nlm_lookup_file() may return NLMv4-specific error codes
If the filehandle is stale, or open access is denied for some reason,
nlm_fopen() may return one of the NLMv4-specific error codes nlm4_stale_fh
or nlm4_failed. These get passed right through nlm_lookup_file(),
and so when nlmsvc_retrieve_args() calls the latter, it needs to filter
the result through the cast_status() machinery.
Failure to do so, will trigger the BUG_ON() in encode_nlm_stat...
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Reported-by: Larry McVoy <lm@bitmover.com>
Cc: stable@kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/clntxdr.c')
-rw-r--r-- | fs/lockd/clntxdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c index d269ada7670e..982d2676e1f8 100644 --- a/fs/lockd/clntxdr.c +++ b/fs/lockd/clntxdr.c @@ -223,7 +223,7 @@ static void encode_nlm_stat(struct xdr_stream *xdr, { __be32 *p; - BUG_ON(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD); + WARN_ON_ONCE(be32_to_cpu(stat) > NLM_LCK_DENIED_GRACE_PERIOD); p = xdr_reserve_space(xdr, 4); *p = stat; } |