From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH Version 4 3/7] NFSv4.1: change nfs4_free_slot parameters for dynamic slots
Date: Wed, 9 Nov 2011 13:58:22 -0500 [thread overview]
Message-ID: <1320865106-1791-3-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1320865106-1791-1-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/nfs4proc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ef098a8..2638291 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -361,9 +361,8 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp
* Must be called while holding tbl->slot_tbl_lock
*/
static void
-nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *free_slot)
+nfs4_free_slot(struct nfs4_slot_table *tbl, u8 free_slotid)
{
- int free_slotid = free_slot - tbl->slots;
int slotid = free_slotid;
BUG_ON(slotid < 0 || slotid >= NFS4_MAX_SLOT_TABLE);
@@ -428,7 +427,7 @@ static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
}
spin_lock(&tbl->slot_tbl_lock);
- nfs4_free_slot(tbl, res->sr_slot);
+ nfs4_free_slot(tbl, res->sr_slot - tbl->slots);
nfs4_check_drain_fc_complete(res->sr_session);
spin_unlock(&tbl->slot_tbl_lock);
res->sr_slot = NULL;
--
1.7.6.4
next prev parent reply other threads:[~2011-11-09 18:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 18:58 [PATCH Version 4 1/7] NFSv4.1: fix backchannel slotid off-by-one bug andros
2011-11-09 18:58 ` [PATCH Version 4 2/7] NFSv4.1: cleanup init and reset of session slot tables andros
2011-11-09 18:58 ` andros [this message]
2011-11-09 18:58 ` [PATCH Version 4 4/7] NFSv4.1: dynamic session slots andros
2011-12-11 13:14 ` Benny Halevy
2011-12-12 16:11 ` Adamson, Andy
2011-12-12 19:59 ` Benny Halevy
2011-12-12 19:21 ` Adamson, Andy
2011-12-12 20:13 ` Benny Halevy
2011-12-13 13:39 ` Adamson, Andy
2011-11-09 18:58 ` [PATCH Version 4 5/7] NFSv4.1: do not drain session on CB_RECALL_SLOT andros
2011-11-09 18:58 ` [PATCH Version 4 6/7] NFSv4.1: rename nfs4_free_slot and nfs4_find_slot andros
2011-11-09 18:58 ` [PATCH Version 4 7/7] NFSv4.1: cleanup comment and debug printk andros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320865106-1791-3-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox