mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
xfs: remove unused mp argument from xfs_verify_fileext()
(Follows from last patch) Signed-off-by: Eric Sandeen <sandeen@redhat.com> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
parent
00139cc68a
commit
f0dd4f4d98
|
|
@ -6087,7 +6087,7 @@ xfs_bmap_validate_extent_raw(
|
|||
int whichfork,
|
||||
struct xfs_bmbt_irec *irec)
|
||||
{
|
||||
if (!xfs_verify_fileext(mp, irec->br_startoff, irec->br_blockcount))
|
||||
if (!xfs_verify_fileext(irec->br_startoff, irec->br_blockcount))
|
||||
return __this_address;
|
||||
|
||||
if (rtfile && whichfork == XFS_DATA_FORK) {
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ xfs_rmap_check_irec(
|
|||
|
||||
/* Check for a valid fork offset, if applicable. */
|
||||
if (is_inode && !is_bmbt &&
|
||||
!xfs_verify_fileext(mp, irec->rm_offset, irec->rm_blockcount))
|
||||
!xfs_verify_fileext(irec->rm_offset, irec->rm_blockcount))
|
||||
return __this_address;
|
||||
|
||||
return NULL;
|
||||
|
|
@ -310,7 +310,7 @@ xfs_rtrmap_check_inode_irec(
|
|||
return __this_address;
|
||||
if (!xfs_verify_rgbext(rtg, irec->rm_startblock, irec->rm_blockcount))
|
||||
return __this_address;
|
||||
if (!xfs_verify_fileext(mp, irec->rm_offset, irec->rm_blockcount))
|
||||
if (!xfs_verify_fileext(irec->rm_offset, irec->rm_blockcount))
|
||||
return __this_address;
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -240,7 +240,6 @@ xfs_verify_fileoff(
|
|||
/* Check that a range of file block offsets do not exceed the maximum. */
|
||||
bool
|
||||
xfs_verify_fileext(
|
||||
struct xfs_mount *mp,
|
||||
xfs_fileoff_t off,
|
||||
xfs_fileoff_t len)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -281,7 +281,6 @@ bool xfs_verify_dablk(xfs_fileoff_t off);
|
|||
void xfs_icount_range(struct xfs_mount *mp, unsigned long long *min,
|
||||
unsigned long long *max);
|
||||
bool xfs_verify_fileoff(xfs_fileoff_t off);
|
||||
bool xfs_verify_fileext(struct xfs_mount *mp, xfs_fileoff_t off,
|
||||
xfs_fileoff_t len);
|
||||
bool xfs_verify_fileext(xfs_fileoff_t off, xfs_fileoff_t len);
|
||||
|
||||
#endif /* __XFS_TYPES_H__ */
|
||||
|
|
|
|||
|
|
@ -485,7 +485,7 @@ xchk_bmap_iextent(
|
|||
xchk_fblock_set_corrupt(info->sc, info->whichfork,
|
||||
irec->br_startoff);
|
||||
|
||||
if (!xfs_verify_fileext(mp, irec->br_startoff, irec->br_blockcount))
|
||||
if (!xfs_verify_fileext(irec->br_startoff, irec->br_blockcount))
|
||||
xchk_fblock_set_corrupt(info->sc, info->whichfork,
|
||||
irec->br_startoff);
|
||||
|
||||
|
|
@ -876,8 +876,6 @@ xchk_bmap_iextent_delalloc(
|
|||
struct xchk_bmap_info *info,
|
||||
struct xfs_bmbt_irec *irec)
|
||||
{
|
||||
struct xfs_mount *mp = info->sc->mp;
|
||||
|
||||
/*
|
||||
* Check for out-of-order extents. This record could have come
|
||||
* from the incore list, for which there is no ordering check.
|
||||
|
|
@ -887,7 +885,7 @@ xchk_bmap_iextent_delalloc(
|
|||
xchk_fblock_set_corrupt(info->sc, info->whichfork,
|
||||
irec->br_startoff);
|
||||
|
||||
if (!xfs_verify_fileext(mp, irec->br_startoff, irec->br_blockcount))
|
||||
if (!xfs_verify_fileext(irec->br_startoff, irec->br_blockcount))
|
||||
xchk_fblock_set_corrupt(info->sc, info->whichfork,
|
||||
irec->br_startoff);
|
||||
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ xrep_bmap_check_fork_rmap(
|
|||
|
||||
/* Check the file offset range. */
|
||||
if (!(rec->rm_flags & XFS_RMAP_BMBT_BLOCK) &&
|
||||
!xfs_verify_fileext(sc->mp, rec->rm_offset, rec->rm_blockcount))
|
||||
!xfs_verify_fileext(rec->rm_offset, rec->rm_blockcount))
|
||||
return -EFSCORRUPTED;
|
||||
|
||||
/* No contradictory flags. */
|
||||
|
|
@ -389,7 +389,7 @@ xrep_bmap_check_rtfork_rmap(
|
|||
return -EFSCORRUPTED;
|
||||
|
||||
/* Check the file offsets and physical extents. */
|
||||
if (!xfs_verify_fileext(sc->mp, rec->rm_offset, rec->rm_blockcount))
|
||||
if (!xfs_verify_fileext(rec->rm_offset, rec->rm_blockcount))
|
||||
return -EFSCORRUPTED;
|
||||
|
||||
/* Check that this is within the rtgroup. */
|
||||
|
|
|
|||
|
|
@ -442,7 +442,7 @@ xfs_bui_validate(
|
|||
if (!xfs_verify_ino(mp, map->me_owner))
|
||||
return false;
|
||||
|
||||
if (!xfs_verify_fileext(mp, map->me_startoff, map->me_len))
|
||||
if (!xfs_verify_fileext(map->me_startoff, map->me_len))
|
||||
return false;
|
||||
|
||||
if (map->me_flags & XFS_BMAP_EXTENT_REALTIME)
|
||||
|
|
|
|||
|
|
@ -341,10 +341,10 @@ xfs_xmi_validate(
|
|||
!xfs_verify_ino(mp, xlf->xmi_inode2))
|
||||
return false;
|
||||
|
||||
if (!xfs_verify_fileext(mp, xlf->xmi_startoff1, xlf->xmi_blockcount))
|
||||
if (!xfs_verify_fileext(xlf->xmi_startoff1, xlf->xmi_blockcount))
|
||||
return false;
|
||||
|
||||
if (!xfs_verify_fileext(mp, xlf->xmi_startoff2, xlf->xmi_blockcount))
|
||||
if (!xfs_verify_fileext(xlf->xmi_startoff2, xlf->xmi_blockcount))
|
||||
return false;
|
||||
|
||||
if (xlf->xmi_flags & XFS_EXCHMAPS_SET_SIZES) {
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ xfs_rui_validate_map(
|
|||
!xfs_verify_ino(mp, map->me_owner))
|
||||
return false;
|
||||
|
||||
if (!xfs_verify_fileext(mp, map->me_startoff, map->me_len))
|
||||
if (!xfs_verify_fileext(map->me_startoff, map->me_len))
|
||||
return false;
|
||||
|
||||
if (isrt)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user