Skip to content

Commit 08b45fc

Browse files
Dan Carpenteramschuma-ntap
authored andcommitted
nfs/blocklayout: Use the passed in gfp flags
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: 5c83746 ("pnfs/blocklayout: in-kernel GETDEVICEINFO XDR parsing") Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Anna Schumaker <[email protected]>
1 parent a841c9c commit 08b45fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/nfs/blocklayout/dev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d,
404404
int ret, i;
405405

406406
d->children = kcalloc(v->concat.volumes_count,
407-
sizeof(struct pnfs_block_dev), GFP_KERNEL);
407+
sizeof(struct pnfs_block_dev), gfp_mask);
408408
if (!d->children)
409409
return -ENOMEM;
410410

@@ -433,7 +433,7 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d,
433433
int ret, i;
434434

435435
d->children = kcalloc(v->stripe.volumes_count,
436-
sizeof(struct pnfs_block_dev), GFP_KERNEL);
436+
sizeof(struct pnfs_block_dev), gfp_mask);
437437
if (!d->children)
438438
return -ENOMEM;
439439

0 commit comments

Comments
 (0)