diff options
author | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
commit | 957265bd4fe182af757886f117416d66f68854aa (patch) | |
tree | 177cee182ea61611f0b80db704203bf72ee4f3cb /fs/lockd/clntxdr.c | |
parent | 60c98d9abbd1ff3274b904027690f3c33d656250 (diff) | |
parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) |
Merge commit 'v3.4-rc4' into android-3.4
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 3d35e3e80c1..d269ada7670 100644 --- a/fs/lockd/clntxdr.c +++ b/fs/lockd/clntxdr.c @@ -236,7 +236,7 @@ static int decode_nlm_stat(struct xdr_stream *xdr, p = xdr_inline_decode(xdr, 4); if (unlikely(p == NULL)) goto out_overflow; - if (unlikely(*p > nlm_lck_denied_grace_period)) + if (unlikely(ntohl(*p) > ntohl(nlm_lck_denied_grace_period))) goto out_enum; *stat = *p; return 0; |