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

Commit 87e73331 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: introduce XFS_MAX_FILEOFF 



commit a5084865524dee1fe8ea1fee17c60b4369ad4f5e upstream.

Introduce a new #define for the maximum supported file block offset.
We'll use this in the next patch to make it more obvious that we're
doing some operation for all possible inode fork mappings after a given
offset.  We can't use ULLONG_MAX here because bunmapi uses that to
detect when it's done.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bd67d06b

fs/xfs/libxfs/xfs_format.h

+7 −0
Original line number Diff line number Diff line
@@ -1540,6 +1540,13 @@ typedef struct xfs_bmdr_block { 
#define BMBT_BLOCKCOUNT_BITLEN	21



#define BMBT_STARTOFF_MASK	((1ULL << BMBT_STARTOFF_BITLEN) - 1)

#define BMBT_BLOCKCOUNT_MASK	((1ULL << BMBT_BLOCKCOUNT_BITLEN) - 1)



/*

 * bmbt records have a file offset (block) field that is 54 bits wide, so this

 * is the largest xfs_fileoff_t that we ever expect to see.

 */

#define XFS_MAX_FILEOFF		(BMBT_STARTOFF_MASK + BMBT_BLOCKCOUNT_MASK)



typedef struct xfs_bmbt_rec {

	__be64			l0, l1;

fs/xfs/xfs_reflink.c

+2 −1
Original line number Diff line number Diff line
@@ -1544,7 +1544,8 @@ xfs_reflink_clear_inode_flag( 
	 * We didn't find any shared blocks so turn off the reflink flag.

	 * First, get rid of any leftover CoW mappings.

	 */

	error = xfs_reflink_cancel_cow_blocks(ip, tpp, 0, NULLFILEOFF, true);

	error = xfs_reflink_cancel_cow_blocks(ip, tpp, 0, XFS_MAX_FILEOFF,

			true);

	if (error)

		return error;