diff options
| author | Greg Kroah-Hartman | 2016-11-14 08:11:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-11-14 08:11:29 +0100 |
| commit | 8a0a8e1c42fdf656e7b729e9c468c2caa687adb7 (patch) | |
| tree | bde58e16dd5e6912deccac7e41b9a95f05187ea6 /fs/nfs/nfs4session.c | |
| parent | USB: cdc-acm: use get_icount tty operation (diff) | |
| parent | Linux 4.9-rc5 (diff) | |
| download | kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.gz kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.xz kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.zip | |
Merge 4.9-rc5 into usb-next
We want/need the USB fixes in here as well, for testing and merge
issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs/nfs4session.c')
| -rw-r--r-- | fs/nfs/nfs4session.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index b62973045a3e..a61350f75c74 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c @@ -178,12 +178,14 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table *tbl, u32 slotid, __must_hold(&tbl->slot_tbl_lock) { struct nfs4_slot *slot; + int ret; slot = nfs4_lookup_slot(tbl, slotid); - if (IS_ERR(slot)) - return PTR_ERR(slot); - *seq_nr = slot->seq_nr; - return 0; + ret = PTR_ERR_OR_ZERO(slot); + if (!ret) + *seq_nr = slot->seq_nr; + + return ret; } /* @@ -196,7 +198,7 @@ static int nfs4_slot_get_seqid(struct nfs4_slot_table *tbl, u32 slotid, static bool nfs4_slot_seqid_in_use(struct nfs4_slot_table *tbl, u32 slotid, u32 seq_nr) { - u32 cur_seq; + u32 cur_seq = 0; bool ret = false; spin_lock(&tbl->slot_tbl_lock); |