diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-11-21 04:32:48 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-12-06 00:30:42 +0100 |
| commit | 1b285ff16ab52fb401aed7ce70abed4bb65b30b5 (patch) | |
| tree | 8d2378e2d1ac90dfd5be8725c86cc2a7522cf267 /fs/nfs | |
| parent | NFSv4.1: Don't confuse target_highest_slotid and max_slots in cb_recall_slot (diff) | |
| download | linux-1b285ff16ab52fb401aed7ce70abed4bb65b30b5.tar.xz linux-1b285ff16ab52fb401aed7ce70abed4bb65b30b5.zip | |
NFSv4.1: Allow the server to recall all but one slot
If the server wants to leave us with only one slot, or it wants
to "shrink" our slot table to something larger than we have now,
then so be it.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/callback_proc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index ed0b446e2e38..a0546eca6f6b 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -567,11 +567,6 @@ __be32 nfs4_callback_recallslot(struct cb_recallslotargs *args, void *dummy, fc_tbl = &cps->clp->cl_session->fc_slot_table; - status = htonl(NFS4ERR_BAD_HIGH_SLOT); - if (args->crsa_target_highest_slotid >= fc_tbl->max_slots || - args->crsa_target_highest_slotid < 1) - goto out; - status = htonl(NFS4_OK); nfs41_set_target_slotid(fc_tbl, args->crsa_target_highest_slotid); |