diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-05 11:05:54 +0100 |
| commit | 0ea97d66df2a8b85698823b4d55d798a7870d7b5 (patch) | |
| tree | e4f36af1342ebcbcb5878e66b1e72661b6f2ca1d /fs/nfs/callback_proc.c | |
| parent | eed41b9f413f40183095d27ffc94fb942fe18bb6 (diff) | |
| parent | 6183a1afdd2fb1c994e95af9d6db45f157241a04 (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.07-rt
Diffstat (limited to 'fs/nfs/callback_proc.c')
| -rw-r--r-- | fs/nfs/callback_proc.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index 19151f6c0e97..516b2248cafe 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -420,11 +420,8 @@ validate_seqid(const struct nfs4_slot_table *tbl, const struct nfs4_slot *slot, return htonl(NFS4ERR_SEQ_FALSE_RETRY); } - /* Wraparound */ - if (unlikely(slot->seq_nr == 0xFFFFFFFFU)) { - if (args->csa_sequenceid == 1) - return htonl(NFS4_OK); - } else if (likely(args->csa_sequenceid == slot->seq_nr + 1)) + /* Note: wraparound relies on seq_nr being of type u32 */ + if (likely(args->csa_sequenceid == slot->seq_nr + 1)) return htonl(NFS4_OK); /* Misordered request */ |