xfs: remove the unused trimmed argument from xfs_reflink_trim_around_shared (d392bc81) · Commits · 戴 / test

fs/xfs/xfs_bmap_util.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -406,10 +406,10 @@ xfs_getbmap_report_one(
		struct xfs_bmbt_irec *got)
		{
		struct kgetbmap *p = out + bmv->bmv_entries;
		bool shared = false, trimmed = false;
		bool shared = false;
		int error;

		error = xfs_reflink_trim_around_shared(ip, got, &shared, &trimmed);
		error = xfs_reflink_trim_around_shared(ip, got, &shared);
		if (error)
		return error;

fs/xfs/xfs_iomap.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1032,7 +1032,7 @@ xfs_file_iomap_begin(
		struct xfs_bmbt_irec imap;
		xfs_fileoff_t offset_fsb, end_fsb;
		int nimaps = 1, error = 0;
		bool shared = false, trimmed = false;
		bool shared = false;
		unsigned lockmode;

		if (XFS_FORCED_SHUTDOWN(mp))
		@@ -1068,8 +1068,7 @@ xfs_file_iomap_begin(

		if (flags & IOMAP_REPORT) {
		/* Trim the mapping to the nearest shared extent boundary. */
		error = xfs_reflink_trim_around_shared(ip, &imap, &shared,
		&trimmed);
		error = xfs_reflink_trim_around_shared(ip, &imap, &shared);
		if (error)
		goto out_unlock;
		}

fs/xfs/xfs_reflink.c

+5 −10

Original line number	Diff line number	Diff line
		@@ -182,8 +182,7 @@ int
		xfs_reflink_trim_around_shared(
		struct xfs_inode *ip,
		struct xfs_bmbt_irec *irec,
		bool *shared,
		bool *trimmed)
		bool *shared)
		{
		xfs_agnumber_t agno;
		xfs_agblock_t agbno;
		@@ -209,7 +208,7 @@ xfs_reflink_trim_around_shared(
		if (error)
		return error;

		shared = trimmed = false;
		*shared = false;
		if (fbno == NULLAGBLOCK) {
		/* No shared blocks at all. */
		return 0;
		@@ -222,8 +221,6 @@ xfs_reflink_trim_around_shared(
		*/
		irec->br_blockcount = flen;
		*shared = true;
		if (flen != aglen)
		*trimmed = true;
		return 0;
		} else {
		/*
		@@ -233,7 +230,6 @@ xfs_reflink_trim_around_shared(
		* start of the shared region.
		*/
		irec->br_blockcount = fbno - agbno;
		*trimmed = true;
		return 0;
		}
		}
		@@ -255,7 +251,7 @@ xfs_reflink_reserve_cow(
		struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
		struct xfs_bmbt_irec got;
		int error = 0;
		bool eof = false, trimmed;
		bool eof = false;
		struct xfs_iext_cursor icur;
		bool shared;

		@@ -277,7 +273,7 @@ xfs_reflink_reserve_cow(
		}

		/* Trim the mapping to the nearest shared extent boundary. */
		error = xfs_reflink_trim_around_shared(ip, imap, &shared, &trimmed);
		error = xfs_reflink_trim_around_shared(ip, imap, &shared);
		if (error)
		return error;

		@@ -366,7 +362,6 @@ xfs_find_trim_cow_extent(
		xfs_filblks_t count_fsb = imap->br_blockcount;
		struct xfs_iext_cursor icur;
		struct xfs_bmbt_irec got;
		bool trimmed;

		*found = false;

		@@ -376,7 +371,7 @@ xfs_find_trim_cow_extent(
		*/
		if (!xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &got) \|\|
		got.br_startoff > offset_fsb)
		return xfs_reflink_trim_around_shared(ip, imap, shared, &trimmed);
		return xfs_reflink_trim_around_shared(ip, imap, shared);

		*shared = true;
		if (isnullstartblock(got.br_startblock)) {

fs/xfs/xfs_reflink.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ extern int xfs_reflink_find_shared(struct xfs_mount mp, struct xfs_trans tp,
		xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen,
		xfs_agblock_t fbno, xfs_extlen_t flen, bool find_maximal);
		extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip,
		struct xfs_bmbt_irec irec, bool shared, bool *trimmed);
		struct xfs_bmbt_irec irec, bool shared);

		extern int xfs_reflink_reserve_cow(struct xfs_inode *ip,
		struct xfs_bmbt_irec *imap);

Admin message