Skip to content

Commit a245832

Browse files
author
Trond Myklebust
committed
pNFS/files: Ensure pNFS allocation modes are consistent with nfsiod
Ensure that pNFS file commit allocations in rpciod/nfsiod callbacks can fail in low memory mode, so that the threads don't block and loop forever. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 3e5f151 commit a245832

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/nfs/filelayout/filelayout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ filelayout_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo,
10751075
unsigned int size = (fl->stripe_type == STRIPE_SPARSE) ?
10761076
fl->dsaddr->ds_num : fl->dsaddr->stripe_count;
10771077

1078-
new = pnfs_alloc_commit_array(size, GFP_NOIO);
1078+
new = pnfs_alloc_commit_array(size, nfs_io_gfp_mask());
10791079
if (new) {
10801080
spin_lock(&inode->i_lock);
10811081
array = pnfs_add_commit_array(fl_cinfo, new, lseg);

0 commit comments

Comments
 (0)