Commit a6e39dde authored Jul 24, 2023 by Dan Carpenter Committed by Greg Kroah-Hartman Sep 23, 2023

nfs/blocklayout: Use the passed in gfp flags



[ Upstream commit 08b45fcb2d4675f6182fe0edc0d8b1fe604051fa ]

This allocation should use the passed in GFP_ flags instead of
GFP_KERNEL.  One places where this matters is in filelayout_pg_init_write()
which uses GFP_NOFS as the allocation flags.

Fixes: 5c83746a ("pnfs/blocklayout: in-kernel GETDEVICEINFO XDR parsing")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d1bc8227

fs/nfs/blocklayout/dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ bl_parse_concat(struct nfs_server server, struct pnfs_block_dev d,
		int ret, i;

		d->children = kcalloc(v->concat.volumes_count,
		sizeof(struct pnfs_block_dev), GFP_KERNEL);
		sizeof(struct pnfs_block_dev), gfp_mask);
		if (!d->children)
		return -ENOMEM;

		@@ -451,7 +451,7 @@ bl_parse_stripe(struct nfs_server server, struct pnfs_block_dev d,
		int ret, i;

		d->children = kcalloc(v->stripe.volumes_count,
		sizeof(struct pnfs_block_dev), GFP_KERNEL);
		sizeof(struct pnfs_block_dev), gfp_mask);
		if (!d->children)
		return -ENOMEM;