From ede42e3dfebb872c3fe055af6fd5505e2f5cf24b Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Thu, 21 Jan 2010 14:19:16 -0500 Subject: [PATCH] --- yaml --- r: 186143 b: refs/heads/master c: bae0ac0ee1839e345a9b26d8c00eb3ef565caad1 h: refs/heads/master i: 186141: ff0d9800f5cd48731ff4db4edc3cb073257c6d68 186139: a972fc754046a07bf145c65e5295febcc569a757 186135: 6e6acb481e9a10ff1bd2a4e984bd21a47e2c1dc4 186127: ec745950228b0b409d001d888fc4a9d7c31d14ca 186111: d2f318f98fe85051d6b203777195fdae878964b5 v: v3 --- [refs] | 2 +- trunk/fs/nfs/callback_proc.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e6a83c2425dc..6b3b98188771 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 104aeba484c9291cde2def6d037b836af46d8eb0 +refs/heads/master: bae0ac0ee1839e345a9b26d8c00eb3ef565caad1 diff --git a/trunk/fs/nfs/callback_proc.c b/trunk/fs/nfs/callback_proc.c index e5155d9df595..c79e18cd0e15 100644 --- a/trunk/fs/nfs/callback_proc.c +++ b/trunk/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));