Commit a245832a authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 3e5f151e

fs/nfs/filelayout/filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ filelayout_setup_ds_info(struct pnfs_ds_commit_info *fl_cinfo, 
	unsigned int size = (fl->stripe_type == STRIPE_SPARSE) ?

		fl->dsaddr->ds_num : fl->dsaddr->stripe_count;



	new = pnfs_alloc_commit_array(size, GFP_NOIO);

	new = pnfs_alloc_commit_array(size, nfs_io_gfp_mask());

	if (new) {

		spin_lock(&inode->i_lock);

		array = pnfs_add_commit_array(fl_cinfo, new, lseg);