* [PATCH] nfsd: Pass correct slot number to nfsd4_put_drc_mem()
@ 2012-12-24 10:11 ycnian
2013-01-03 0:34 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: ycnian @ 2012-12-24 10:11 UTC (permalink / raw)
To: bfields; +Cc: linux-kernel, linux-nfs, Yanchuan Nian
From: Yanchuan Nian <ycnian@gmail.com>
In alloc_session(), numslots is the correct slot number used by the session.
But the slot number passed to nfsd4_put_drc_mem() is the one from nfs client.
Signed-off-by: Yanchuan Nian <ycnian@gmail.com>
---
fs/nfsd/nfs4state.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index ac8ed96..29924a0 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -905,7 +905,7 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fchan,
new = __alloc_session(slotsize, numslots);
if (!new) {
- nfsd4_put_drc_mem(slotsize, fchan->maxreqs);
+ nfsd4_put_drc_mem(slotsize, numslots);
return NULL;
}
init_forechannel_attrs(&new->se_fchannel, fchan, numslots, slotsize, nn);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] nfsd: Pass correct slot number to nfsd4_put_drc_mem()
2012-12-24 10:11 [PATCH] nfsd: Pass correct slot number to nfsd4_put_drc_mem() ycnian
@ 2013-01-03 0:34 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2013-01-03 0:34 UTC (permalink / raw)
To: ycnian; +Cc: linux-kernel, linux-nfs
On Mon, Dec 24, 2012 at 06:11:27PM +0800, ycnian@gmail.com wrote:
> From: Yanchuan Nian <ycnian@gmail.com>
>
> In alloc_session(), numslots is the correct slot number used by the session.
> But the slot number passed to nfsd4_put_drc_mem() is the one from nfs client.
Thanks, applying for 3.9.--b.
>
> Signed-off-by: Yanchuan Nian <ycnian@gmail.com>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index ac8ed96..29924a0 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -905,7 +905,7 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fchan,
>
> new = __alloc_session(slotsize, numslots);
> if (!new) {
> - nfsd4_put_drc_mem(slotsize, fchan->maxreqs);
> + nfsd4_put_drc_mem(slotsize, numslots);
> return NULL;
> }
> init_forechannel_attrs(&new->se_fchannel, fchan, numslots, slotsize, nn);
> --
> 1.7.4.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-03 0:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-24 10:11 [PATCH] nfsd: Pass correct slot number to nfsd4_put_drc_mem() ycnian
2013-01-03 0:34 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox