Commit e6bbda8d authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Zizhi Wo
Browse files

xfs: use XFS_BUF_DADDR_NULL for daddrs in getfsmap code 

mainline inclusion
from mainline-v6.11-rc6
commit 6b35cc8d9239569700cc7cc737c8ed40b8b9cfdb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB42M2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6b35cc8d9239569700cc7cc737c8ed40b8b9cfdb



--------------------------------

Use XFS_BUF_DADDR_NULL (instead of a magic sentinel value) to mean "this
field is null" like the rest of xfs.

Cc: wozizhi@huawei.com
Fixes: e89c0413 ("xfs: implement the GETFSMAP ioctl")
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
Signed-off-by: default avatarZizhi Wo <wozizhi@huawei.com>
parent 19640fb0

fs/xfs/xfs_fsmap.c

+2 −2
Original line number Diff line number Diff line
@@ -252,7 +252,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;
@@ -986,7 +986,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)