Commit 85a0d0c9 authored by Xiu Jianfeng's avatar Xiu Jianfeng Committed by Chuck Lever

NFSD: Use struct_size() helper in alloc_session()

Use struct_size() helper to simplify the code, no functional changes.
Signed-off-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 01d53a88
...@@ -1833,13 +1833,12 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs, ...@@ -1833,13 +1833,12 @@ static struct nfsd4_session *alloc_session(struct nfsd4_channel_attrs *fattrs,
int numslots = fattrs->maxreqs; int numslots = fattrs->maxreqs;
int slotsize = slot_bytes(fattrs); int slotsize = slot_bytes(fattrs);
struct nfsd4_session *new; struct nfsd4_session *new;
int mem, i; int i;
BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot *) BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)
+ sizeof(struct nfsd4_session) > PAGE_SIZE); > PAGE_SIZE);
mem = numslots * sizeof(struct nfsd4_slot *);
new = kzalloc(sizeof(*new) + mem, GFP_KERNEL); new = kzalloc(struct_size(new, se_slots, numslots), GFP_KERNEL);
if (!new) if (!new)
return NULL; return NULL;
/* allocate each struct nfsd4_slot and data cache in one piece */ /* allocate each struct nfsd4_slot and data cache in one piece */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment