Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <a962c50bf96528468e33a91bbde016cf780a2d78.camel@kernel.org>
Subject: Re: [PATCH -next] NFSD: Use struct_size() helpler in alloc_session()
From:   Jeff Layton <jlayton@kernel.org>
To:     Xiu Jianfeng <xiujianfeng@huawei.com>, chuck.lever@oracle.com
Cc:     linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Date:   Fri, 11 Nov 2022 09:50:15 -0500
In-Reply-To: <20221111091835.151942-1-xiujianfeng@huawei.com>
References: <20221111091835.151942-1-xiujianfeng@huawei.com>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Fri, 2022-11-11 at 17:18 +0800, Xiu Jianfeng wrote:
> Use struct_size() helper to simplify the code, no functional changes.
>=20
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
>  fs/nfsd/nfs4state.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>=20
> 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 =3D fattrs->maxreqs;
>  	int slotsize =3D slot_bytes(fattrs);
>  	struct nfsd4_session *new;
> -	int mem, i;
> +	int i;
> =20
> -	BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot *)
> -			+ sizeof(struct nfsd4_session) > PAGE_SIZE);
> -	mem =3D numslots * sizeof(struct nfsd4_slot *);
> +	BUILD_BUG_ON(struct_size(new, se_slots, NFSD_MAX_SLOTS_PER_SESSION)
> +		     > PAGE_SIZE);
> =20
> -	new =3D kzalloc(sizeof(*new) + mem, GFP_KERNEL);
> +	new =3D 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>