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

Commit ac14876c authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: fix missing KM_NOFS tags to keep lockdep happy 



There are several places where we use KM_SLEEP allocation contexts
and use the fact that they are called from transaction context to
add KM_NOFS where appropriate. Unfortunately, there are several
places where the code makes this assumption but can be called from
outside transaction context but with filesystem locks held. These
places need explicit KM_NOFS annotations to avoid lockdep
complaining about reclaim contexts.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 52c24ad3

fs/xfs/xfs_buf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1649,7 +1649,7 @@ xfs_alloc_buftarg( 
{

{

	xfs_buftarg_t		*btp;

	xfs_buftarg_t		*btp;





	btp = kmem_zalloc(sizeof(*btp), KM_SLEEP);

	btp = kmem_zalloc(sizeof(*btp), KM_SLEEP | KM_NOFS);





	btp->bt_mount = mp;

	btp->bt_mount = mp;

	btp->bt_dev =  bdev->bd_dev;

	btp->bt_dev =  bdev->bd_dev;

fs/xfs/xfs_da_btree.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -2464,7 +2464,8 @@ xfs_buf_map_from_irec( 
	ASSERT(nirecs >= 1);

	ASSERT(nirecs >= 1);





	if (nirecs > 1) {

	if (nirecs > 1) {

		map = kmem_zalloc(nirecs * sizeof(struct xfs_buf_map), KM_SLEEP);

		map = kmem_zalloc(nirecs * sizeof(struct xfs_buf_map),

				  KM_SLEEP | KM_NOFS);

		if (!map)

		if (!map)

			return ENOMEM;

			return ENOMEM;

		*mapp = map;

		*mapp = map;
@@ -2520,7 +2521,8 @@ xfs_dabuf_map( 
		 * Optimize the one-block case.

		 * Optimize the one-block case.

		 */

		 */

		if (nfsb != 1)

		if (nfsb != 1)

			irecs = kmem_zalloc(sizeof(irec) * nfsb, KM_SLEEP);

			irecs = kmem_zalloc(sizeof(irec) * nfsb,

					    KM_SLEEP | KM_NOFS);





		nirecs = nfsb;

		nirecs = nfsb;

		error = xfs_bmapi_read(dp, (xfs_fileoff_t)bno, nfsb, irecs,

		error = xfs_bmapi_read(dp, (xfs_fileoff_t)bno, nfsb, irecs,

fs/xfs/xfs_dir2_leaf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1336,7 +1336,7 @@ xfs_dir2_leaf_getdents( 
				     mp->m_sb.sb_blocksize);

				     mp->m_sb.sb_blocksize);

	map_info = kmem_zalloc(offsetof(struct xfs_dir2_leaf_map_info, map) +

	map_info = kmem_zalloc(offsetof(struct xfs_dir2_leaf_map_info, map) +

				(length * sizeof(struct xfs_bmbt_irec)),

				(length * sizeof(struct xfs_bmbt_irec)),

			       KM_SLEEP);

			       KM_SLEEP | KM_NOFS);

	map_info->map_size = length;

	map_info->map_size = length;





	/*

	/*

fs/xfs/xfs_log_cil.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ xlog_cil_prepare_log_vecs( 




		new_lv = kmem_zalloc(sizeof(*new_lv) +

		new_lv = kmem_zalloc(sizeof(*new_lv) +

				niovecs * sizeof(struct xfs_log_iovec),

				niovecs * sizeof(struct xfs_log_iovec),

				KM_SLEEP);

				KM_SLEEP|KM_NOFS);





		/* The allocated iovec region lies beyond the log vector. */

		/* The allocated iovec region lies beyond the log vector. */

		new_lv->lv_iovecp = (struct xfs_log_iovec *)&new_lv[1];

		new_lv->lv_iovecp = (struct xfs_log_iovec *)&new_lv[1];