Unverified Commit 7881f070 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13230 xfs: Fix fsmap error 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XLVZJ4WX4SHYPIJDGUM6EJPEUYOEXTQO/ 
Darrick J. Wong (1):
  xfs: use XFS_BUF_DADDR_NULL for daddrs in getfsmap code

Zizhi Wo (1):
  xfs: Fix missing interval for missing_owner in xfs fsmap


-- 
2.46.1
 
https://gitee.com/openeuler/kernel/issues/IB42M2 
 
Link:https://gitee.com/openeuler/kernel/pulls/13230

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 48af55f7 85c4985c

fs/xfs/xfs_fsmap.c

+25 −3
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ struct xfs_getfsmap_info { 
	xfs_daddr_t		next_daddr;	/* next daddr we expect */

	/* daddr of low fsmap key when we're using the rtbitmap */

	xfs_daddr_t		low_daddr;

	xfs_daddr_t		end_daddr;	/* daddr of high fsmap key */

	u64			missing_owner;	/* owner of holes */

	u32			dev;		/* device id */

	/*
@@ -182,6 +183,7 @@ struct xfs_getfsmap_dev { 
	int			(*fn)(struct xfs_trans *tp,

				      const struct xfs_fsmap *keys,

				      struct xfs_getfsmap_info *info);

	sector_t		nr_sectors;

};



/* Compare two getfsmap device handlers. */
@@ -252,7 +254,7 @@ xfs_getfsmap_rec_before_start( 
	const struct xfs_rmap_irec	*rec,

	xfs_daddr_t			rec_daddr)

{

	if (info->low_daddr != -1ULL)

	if (info->low_daddr != XFS_BUF_DADDR_NULL)

		return rec_daddr < info->low_daddr;

	if (info->low.rm_blockcount)

		return xfs_rmap_compare(rec, &info->low) < 0;
@@ -294,6 +296,18 @@ xfs_getfsmap_helper( 
		return 0;

	}



	/*

	 * For an info->last query, we're looking for a gap between the last

	 * mapping emitted and the high key specified by userspace.  If the

	 * user's query spans less than 1 fsblock, then info->high and

	 * info->low will have the same rm_startblock, which causes rec_daddr

	 * and next_daddr to be the same.  Therefore, use the end_daddr that

	 * we calculated from userspace's high key to synthesize the record.

	 * Note that if the btree query found a mapping, there won't be a gap.

	 */

	if (info->last && info->end_daddr != XFS_BUF_DADDR_NULL)

		rec_daddr = info->end_daddr;



	/* Are we just counting mappings? */

	if (info->head->fmh_count == 0) {

		if (info->head->fmh_entries == UINT_MAX)
@@ -907,17 +921,21 @@ xfs_getfsmap( 


	/* Set up our device handlers. */

	memset(handlers, 0, sizeof(handlers));

	handlers[0].nr_sectors = XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks);

	handlers[0].dev = new_encode_dev(mp->m_ddev_targp->bt_dev);

	if (use_rmap)

		handlers[0].fn = xfs_getfsmap_datadev_rmapbt;

	else

		handlers[0].fn = xfs_getfsmap_datadev_bnobt;

	if (mp->m_logdev_targp != mp->m_ddev_targp) {

		handlers[1].nr_sectors = XFS_FSB_TO_BB(mp,

						       mp->m_sb.sb_logblocks);

		handlers[1].dev = new_encode_dev(mp->m_logdev_targp->bt_dev);

		handlers[1].fn = xfs_getfsmap_logdev;

	}

#ifdef CONFIG_XFS_RT

	if (mp->m_rtdev_targp) {

		handlers[2].nr_sectors = XFS_FSB_TO_BB(mp, mp->m_sb.sb_rblocks);

		handlers[2].dev = new_encode_dev(mp->m_rtdev_targp->bt_dev);

		handlers[2].fn = xfs_getfsmap_rtdev_rtbitmap;

	}
@@ -949,6 +967,7 @@ xfs_getfsmap( 


	info.next_daddr = head->fmh_keys[0].fmr_physical +

			  head->fmh_keys[0].fmr_length;

	info.end_daddr = XFS_BUF_DADDR_NULL;

	info.fsmap_recs = fsmap_recs;

	info.head = head;
@@ -969,8 +988,11 @@ xfs_getfsmap( 
		 * low key, zero out the low key so that we get

		 * everything from the beginning.

		 */

		if (handlers[i].dev == head->fmh_keys[1].fmr_device)

		if (handlers[i].dev == head->fmh_keys[1].fmr_device) {

			dkeys[1] = head->fmh_keys[1];

			info.end_daddr = min(handlers[i].nr_sectors - 1,

					     dkeys[1].fmr_physical);

		}

		if (handlers[i].dev > head->fmh_keys[0].fmr_device)

			memset(&dkeys[0], 0, sizeof(struct xfs_fsmap));
@@ -986,7 +1008,7 @@ xfs_getfsmap( 
		info.dev = handlers[i].dev;

		info.last = false;

		info.pag = NULL;

		info.low_daddr = -1ULL;

		info.low_daddr = XFS_BUF_DADDR_NULL;

		info.low.rm_blockcount = 0;

		error = handlers[i].fn(tp, dkeys, &info);

		if (error)