Skip to content

Commit

Permalink
nfs41: fix nfs4_callback_recallslot
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Adamson authored and Trond Myklebust committed Feb 10, 2010
1 parent 104aeba commit bae0ac0
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions fs/nfs/callback_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit bae0ac0

Please sign in to comment.