* [PATCH -next] NFSD: Use struct_size() helpler in alloc_session()
@ 2022-11-11 9:18 Xiu Jianfeng
2022-11-11 14:50 ` Jeff Layton
2022-11-11 15:06 ` Chuck Lever III
0 siblings, 2 replies; 3+ messages in thread
From: Xiu Jianfeng @ 2022-11-11 9:18 UTC (permalink / raw)
To: chuck.lever, jlayton; +Cc: linux-nfs, linux-kernel
Use struct_size() helper to simplify the code, no functional changes.
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
fs/nfsd/nfs4state.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2ec981fd2985..97badca3135e 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1833,13 +1833,12 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,
int numslots = fattrs->maxreqs;
int slotsize = slot_bytes(fattrs);
struct nfsd4_session *new;
- int mem, i;
+ int i;
- BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot *)
- + sizeof(struct nfsd4_session) > PAGE_SIZE);
- mem = numslots * sizeof(struct nfsd4_slot *);
+ BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)
+ > PAGE_SIZE);
- new = kzalloc(sizeof(*new) + mem, GFP_KERNEL);
+ new = kzalloc(struct_size(new, se_slots, numslots), GFP_KERNEL);
if (!new)
return NULL;
/* allocate each struct nfsd4_slot and data cache in one piece */
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] NFSD: Use struct_size() helpler in alloc_session()
2022-11-11 9:18 [PATCH -next] NFSD: Use struct_size() helpler in alloc_session() Xiu Jianfeng
@ 2022-11-11 14:50 ` Jeff Layton
2022-11-11 15:06 ` Chuck Lever III
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2022-11-11 14:50 UTC (permalink / raw)
To: Xiu Jianfeng, chuck.lever; +Cc: linux-nfs, linux-kernel
On Fri, 2022-11-11 at 17:18 +0800, Xiu Jianfeng wrote:
> Use struct_size() helper to simplify the code, no functional changes.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
> fs/nfsd/nfs4state.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 2ec981fd2985..97badca3135e 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1833,13 +1833,12 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,
> int numslots = fattrs->maxreqs;
> int slotsize = slot_bytes(fattrs);
> struct nfsd4_session *new;
> - int mem, i;
> + int i;
>
> - BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot *)
> - + sizeof(struct nfsd4_session) > PAGE_SIZE);
> - mem = numslots * sizeof(struct nfsd4_slot *);
> + BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)
> + > PAGE_SIZE);
>
> - new = kzalloc(sizeof(*new) + mem, GFP_KERNEL);
> + new = kzalloc(struct_size(new, se_slots, numslots), GFP_KERNEL);
> if (!new)
> return NULL;
> /* allocate each struct nfsd4_slot and data cache in one piece */
Reviewed-by: Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] NFSD: Use struct_size() helpler in alloc_session()
2022-11-11 9:18 [PATCH -next] NFSD: Use struct_size() helpler in alloc_session() Xiu Jianfeng
2022-11-11 14:50 ` Jeff Layton
@ 2022-11-11 15:06 ` Chuck Lever III
1 sibling, 0 replies; 3+ messages in thread
From: Chuck Lever III @ 2022-11-11 15:06 UTC (permalink / raw)
To: Xiu Jianfeng; +Cc: Jeff Layton, Linux NFS Mailing List, linux-kernel
> On Nov 11, 2022, at 4:18 AM, Xiu Jianfeng <xiujianfeng@huawei.com> wrote:
>
> Use struct_size() helper to simplify the code, no functional changes.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Applied to nfsd's for-next tree. Thanks!
> ---
> fs/nfsd/nfs4state.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 2ec981fd2985..97badca3135e 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1833,13 +1833,12 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,
> int numslots = fattrs->maxreqs;
> int slotsize = slot_bytes(fattrs);
> struct nfsd4_session *new;
> - int mem, i;
> + int i;
>
> - BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot *)
> - + sizeof(struct nfsd4_session) > PAGE_SIZE);
> - mem = numslots * sizeof(struct nfsd4_slot *);
> + BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)
> + > PAGE_SIZE);
>
> - new = kzalloc(sizeof(*new) + mem, GFP_KERNEL);
> + new = kzalloc(struct_size(new, se_slots, numslots), GFP_KERNEL);
> if (!new)
> return NULL;
> /* allocate each struct nfsd4_slot and data cache in one piece */
> --
> 2.17.1
>
--
Chuck Lever
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-11 15:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-11 9:18 [PATCH -next] NFSD: Use struct_size() helpler in alloc_session() Xiu Jianfeng
2022-11-11 14:50 ` Jeff Layton
2022-11-11 15:06 ` Chuck Lever III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®