diff options
| author | Andy Adamson <andros@netapp.com> | 2010-01-21 14:19:16 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-02-10 08:31:00 -0500 |
| commit | bae0ac0ee1839e345a9b26d8c00eb3ef565caad1 (patch) | |
| tree | a4532f4b27afe2dfc83b0b839adc39bd19efdce9 /fs/nfs | |
| parent | 104aeba484c9291cde2def6d037b836af46d8eb0 (diff) | |
| download | linux-3.10-bae0ac0ee1839e345a9b26d8c00eb3ef565caad1.tar.gz linux-3.10-bae0ac0ee1839e345a9b26d8c00eb3ef565caad1.tar.bz2 linux-3.10-bae0ac0ee1839e345a9b26d8c00eb3ef565caad1.zip | |
nfs41: fix nfs4_callback_recallslot
Return NFS4_OK if target high slotid equals enforced high slotid.
Fix nfs_client reference leak.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/callback_proc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index e5155d9df59..c79e18cd0e1 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -381,13 +381,17 @@ unsigned nfs4_callback_recallslot(struct cb_recallslotargs *args, void *dummy) fc_tbl = &clp->cl_session->fc_slot_table; status = htonl(NFS4ERR_BAD_HIGH_SLOT); - if (args->crsa_target_max_slots >= fc_tbl->max_slots || + if (args->crsa_target_max_slots > fc_tbl->max_slots || args->crsa_target_max_slots < 1) - goto out; + goto out_putclient; + + status = htonl(NFS4_OK); + if (args->crsa_target_max_slots == fc_tbl->max_slots) + goto out_putclient; fc_tbl->target_max_slots = args->crsa_target_max_slots; nfs41_handle_recall_slot(clp); - status = htonl(NFS4_OK); +out_putclient: nfs_put_client(clp); /* balance nfs_find_client */ out: dprintk("%s: exit with status = %d\n", __func__, ntohl(status)); |