Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d30d48 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove XFS_TRANS_NOFS 



Instead of a magic flag for xfs_trans_alloc, just ensure all callers
that can't relclaim through the file system use memalloc_nofs_save to
set the per-task nofs flag.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent fe64e0d2

fs/xfs/libxfs/xfs_shared.h

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, 
#define XFS_TRANS_DQ_DIRTY	0x10	/* at least one dquot in trx dirty */

#define XFS_TRANS_RESERVE	0x20    /* OK to use reserved data blocks */

#define XFS_TRANS_NO_WRITECOUNT 0x40	/* do not elevate SB writecount */

#define XFS_TRANS_NOFS		0x80	/* pass KM_NOFS to kmem_alloc */

/*

 * LOWMODE is used by the allocator to activate the lowspace algorithm - when

 * free space is running low the extent allocator may choose to allocate an

fs/xfs/xfs_aops.c

+22 −13
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ xfs_setfilesize_trans_alloc( 
	struct xfs_trans	*tp;

	int			error;



	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0,

				XFS_TRANS_NOFS, &tp);

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp);

	if (error)

		return error;
@@ -235,8 +234,16 @@ xfs_end_ioend( 
	struct xfs_inode	*ip = XFS_I(ioend->io_inode);

	xfs_off_t		offset = ioend->io_offset;

	size_t			size = ioend->io_size;

	unsigned int		nofs_flag;

	int			error;



	/*

	 * We can allocate memory here while doing writeback on behalf of

	 * memory reclaim.  To avoid memory allocation deadlocks set the

	 * task-wide nofs context for the following operations.

	 */

	nofs_flag = memalloc_nofs_save();



	/*

	 * Just clean up the in-memory strutures if the fs has been shut down.

	 */
@@ -277,6 +284,8 @@ xfs_end_ioend( 
		list_del_init(&ioend->io_list);

		xfs_destroy_ioend(ioend, error);

	}



	memalloc_nofs_restore(nofs_flag);

}



/*
@@ -637,21 +646,19 @@ xfs_submit_ioend( 
	struct xfs_ioend	*ioend,

	int			status)

{

	/* Convert CoW extents to regular */

	if (!status && ioend->io_fork == XFS_COW_FORK) {

	unsigned int		nofs_flag;



	/*

		 * Yuk. This can do memory allocation, but is not a

		 * transactional operation so everything is done in GFP_KERNEL

		 * context. That can deadlock, because we hold pages in

		 * writeback state and GFP_KERNEL allocations can block on them.

		 * Hence we must operate in nofs conditions here.

	 * We can allocate memory here while doing writeback on behalf of

	 * memory reclaim.  To avoid memory allocation deadlocks set the

	 * task-wide nofs context for the following operations.

	 */

		unsigned nofs_flag;



	nofs_flag = memalloc_nofs_save();



	/* Convert CoW extents to regular */

	if (!status && ioend->io_fork == XFS_COW_FORK) {

		status = xfs_reflink_convert_cow(XFS_I(ioend->io_inode),

				ioend->io_offset, ioend->io_size);

		memalloc_nofs_restore(nofs_flag);

	}



	/* Reserve log space if we might write beyond the on-disk inode size. */
@@ -662,6 +669,8 @@ xfs_submit_ioend( 
	    !ioend->io_append_trans)

		status = xfs_setfilesize_trans_alloc(ioend);



	memalloc_nofs_restore(nofs_flag);



	ioend->io_bio->bi_private = ioend;

	ioend->io_bio->bi_end_io = xfs_end_bio;

fs/xfs/xfs_file.c

+15 −3
Original line number Diff line number Diff line
@@ -374,6 +374,7 @@ xfs_dio_write_end_io( 
	struct inode		*inode = file_inode(iocb->ki_filp);

	struct xfs_inode	*ip = XFS_I(inode);

	loff_t			offset = iocb->ki_pos;

	unsigned int		nofs_flag;

	int			error = 0;



	trace_xfs_end_io_direct_write(ip, offset, size);
@@ -390,10 +391,17 @@ xfs_dio_write_end_io( 
	 */

	XFS_STATS_ADD(ip->i_mount, xs_write_bytes, size);



	/*

	 * We can allocate memory here while doing writeback on behalf of

	 * memory reclaim.  To avoid memory allocation deadlocks set the

	 * task-wide nofs context for the following operations.

	 */

	nofs_flag = memalloc_nofs_save();



	if (flags & IOMAP_DIO_COW) {

		error = xfs_reflink_end_cow(ip, offset, size);

		if (error)

			return error;

			goto out;

	}



	/*
@@ -402,8 +410,10 @@ xfs_dio_write_end_io( 
	 * earlier allows a racing dio read to find unwritten extents before

	 * they are converted.

	 */

	if (flags & IOMAP_DIO_UNWRITTEN)

		return xfs_iomap_write_unwritten(ip, offset, size, true);

	if (flags & IOMAP_DIO_UNWRITTEN) {

		error = xfs_iomap_write_unwritten(ip, offset, size, true);

		goto out;

	}



	/*

	 * We need to update the in-core inode size here so that we don't end up
@@ -425,6 +435,8 @@ xfs_dio_write_end_io( 
		spin_unlock(&ip->i_flags_lock);

	}



out:

	memalloc_nofs_restore(nofs_flag);

	return error;

}

fs/xfs/xfs_iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ xfs_iomap_write_unwritten( 
		 * complete here and might deadlock on the iolock.

		 */

		error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0,

				XFS_TRANS_RESERVE | XFS_TRANS_NOFS, &tp);

				XFS_TRANS_RESERVE, &tp);

		if (error)

			return error;

fs/xfs/xfs_reflink.c

+2 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ xfs_reflink_cancel_cow_range( 


	/* Start a rolling transaction to remove the mappings */

	error = xfs_trans_alloc(ip->i_mount, &M_RES(ip->i_mount)->tr_write,

			0, 0, XFS_TRANS_NOFS, &tp);

			0, 0, 0, &tp);

	if (error)

		goto out;
@@ -620,7 +620,7 @@ xfs_reflink_end_cow_extent( 


	resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK);

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0,

			XFS_TRANS_RESERVE | XFS_TRANS_NOFS, &tp);

			XFS_TRANS_RESERVE, &tp);

	if (error)

		return error;