Commit d392bc81 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner

xfs: remove the unused trimmed argument from xfs_reflink_trim_around_shared

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent fc439464
...@@ -406,10 +406,10 @@ xfs_getbmap_report_one( ...@@ -406,10 +406,10 @@ xfs_getbmap_report_one(
struct xfs_bmbt_irec *got) struct xfs_bmbt_irec *got)
{ {
struct kgetbmap *p = out + bmv->bmv_entries; struct kgetbmap *p = out + bmv->bmv_entries;
bool shared = false, trimmed = false; bool shared = false;
int error; int error;
error = xfs_reflink_trim_around_shared(ip, got, &shared, &trimmed); error = xfs_reflink_trim_around_shared(ip, got, &shared);
if (error) if (error)
return error; return error;
......
...@@ -1032,7 +1032,7 @@ xfs_file_iomap_begin( ...@@ -1032,7 +1032,7 @@ xfs_file_iomap_begin(
struct xfs_bmbt_irec imap; struct xfs_bmbt_irec imap;
xfs_fileoff_t offset_fsb, end_fsb; xfs_fileoff_t offset_fsb, end_fsb;
int nimaps = 1, error = 0; int nimaps = 1, error = 0;
bool shared = false, trimmed = false; bool shared = false;
unsigned lockmode; unsigned lockmode;
if (XFS_FORCED_SHUTDOWN(mp)) if (XFS_FORCED_SHUTDOWN(mp))
...@@ -1068,8 +1068,7 @@ xfs_file_iomap_begin( ...@@ -1068,8 +1068,7 @@ xfs_file_iomap_begin(
if (flags & IOMAP_REPORT) { if (flags & IOMAP_REPORT) {
/* Trim the mapping to the nearest shared extent boundary. */ /* Trim the mapping to the nearest shared extent boundary. */
error = xfs_reflink_trim_around_shared(ip, &imap, &shared, error = xfs_reflink_trim_around_shared(ip, &imap, &shared);
&trimmed);
if (error) if (error)
goto out_unlock; goto out_unlock;
} }
......
...@@ -182,8 +182,7 @@ int ...@@ -182,8 +182,7 @@ int
xfs_reflink_trim_around_shared( xfs_reflink_trim_around_shared(
struct xfs_inode *ip, struct xfs_inode *ip,
struct xfs_bmbt_irec *irec, struct xfs_bmbt_irec *irec,
bool *shared, bool *shared)
bool *trimmed)
{ {
xfs_agnumber_t agno; xfs_agnumber_t agno;
xfs_agblock_t agbno; xfs_agblock_t agbno;
...@@ -209,7 +208,7 @@ xfs_reflink_trim_around_shared( ...@@ -209,7 +208,7 @@ xfs_reflink_trim_around_shared(
if (error) if (error)
return error; return error;
*shared = *trimmed = false; *shared = false;
if (fbno == NULLAGBLOCK) { if (fbno == NULLAGBLOCK) {
/* No shared blocks at all. */ /* No shared blocks at all. */
return 0; return 0;
...@@ -222,8 +221,6 @@ xfs_reflink_trim_around_shared( ...@@ -222,8 +221,6 @@ xfs_reflink_trim_around_shared(
*/ */
irec->br_blockcount = flen; irec->br_blockcount = flen;
*shared = true; *shared = true;
if (flen != aglen)
*trimmed = true;
return 0; return 0;
} else { } else {
/* /*
...@@ -233,7 +230,6 @@ xfs_reflink_trim_around_shared( ...@@ -233,7 +230,6 @@ xfs_reflink_trim_around_shared(
* start of the shared region. * start of the shared region.
*/ */
irec->br_blockcount = fbno - agbno; irec->br_blockcount = fbno - agbno;
*trimmed = true;
return 0; return 0;
} }
} }
...@@ -255,7 +251,7 @@ xfs_reflink_reserve_cow( ...@@ -255,7 +251,7 @@ xfs_reflink_reserve_cow(
struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK); struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
struct xfs_bmbt_irec got; struct xfs_bmbt_irec got;
int error = 0; int error = 0;
bool eof = false, trimmed; bool eof = false;
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
bool shared; bool shared;
...@@ -277,7 +273,7 @@ xfs_reflink_reserve_cow( ...@@ -277,7 +273,7 @@ xfs_reflink_reserve_cow(
} }
/* Trim the mapping to the nearest shared extent boundary. */ /* 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) if (error)
return error; return error;
...@@ -366,7 +362,6 @@ xfs_find_trim_cow_extent( ...@@ -366,7 +362,6 @@ xfs_find_trim_cow_extent(
xfs_filblks_t count_fsb = imap->br_blockcount; xfs_filblks_t count_fsb = imap->br_blockcount;
struct xfs_iext_cursor icur; struct xfs_iext_cursor icur;
struct xfs_bmbt_irec got; struct xfs_bmbt_irec got;
bool trimmed;
*found = false; *found = false;
...@@ -376,7 +371,7 @@ xfs_find_trim_cow_extent( ...@@ -376,7 +371,7 @@ xfs_find_trim_cow_extent(
*/ */
if (!xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &got) || if (!xfs_iext_lookup_extent(ip, ip->i_cowfp, offset_fsb, &icur, &got) ||
got.br_startoff > offset_fsb) 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; *shared = true;
if (isnullstartblock(got.br_startblock)) { if (isnullstartblock(got.br_startblock)) {
......
...@@ -10,7 +10,7 @@ extern int xfs_reflink_find_shared(struct xfs_mount *mp, struct xfs_trans *tp, ...@@ -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_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen,
xfs_agblock_t *fbno, xfs_extlen_t *flen, bool find_maximal); xfs_agblock_t *fbno, xfs_extlen_t *flen, bool find_maximal);
extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip, 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, extern int xfs_reflink_reserve_cow(struct xfs_inode *ip,
struct xfs_bmbt_irec *imap); struct xfs_bmbt_irec *imap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment