github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: massage xfs_imap_to_bp into xfs_read_icluster

Browse Source 
xfs_imap_to_bp only uses the im_blkno field from struct xfs_imap, so pass
that directly.  Rename the function to xfs_read_icluster, which describes
the functionality much better and matches other helpers like xfs_read_agf
and xfs_read_agi.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2026-06-01 14:43:49 +02:00 committed by Carlos Maiolino
parent 33451947c4
commit caffb4252c
8 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/libxfs/xfs_ialloc.c
View File

@ -1075,7 +1075,7 @@ xfs_dialloc_check_ino(
if (error)
return -EAGAIN;
error = xfs_imap_to_bp(pag_mount(pag), tp, &imap, &bp);
error = xfs_read_icluster(pag_mount(pag), tp, imap.im_blkno, &bp);
if (error)
return -EAGAIN;

12
fs/xfs/libxfs/xfs_inode_buf.c
View File

@ -123,24 +123,22 @@ const struct xfs_buf_ops xfs_inode_buf_ra_ops = {
/*
* This routine is called to map an inode to the buffer containing the on-disk
* version of the inode. It returns a pointer to the buffer containing the
* on-disk inode in the bpp parameter.
* Read the inode cluster at @bno and return it in @bpp.
*/
int
xfs_imap_to_bp(
xfs_read_icluster(
struct xfs_mount *mp,
struct xfs_trans *tp,
struct xfs_imap *imap,
xfs_daddr_t bno,
struct xfs_buf **bpp)
{
int error;
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap->im_blkno,
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, bno,
XFS_FSB_TO_BB(mp, M_IGEO(mp)->blocks_per_cluster),
0, bpp, &xfs_inode_buf_ops);
if (xfs_metadata_is_sick(error))
xfs_agno_mark_sick(mp, xfs_daddr_to_agno(mp, imap->im_blkno),
xfs_agno_mark_sick(mp, xfs_daddr_to_agno(mp, bno),
XFS_SICK_AG_INODES);
return error;
}

6
fs/xfs/libxfs/xfs_inode_buf.h
View File

@ -11,15 +11,15 @@ struct xfs_dinode;
/*
* Inode location information. Stored in the inode and passed to
* xfs_imap_to_bp() to get a buffer and dinode for a given inode.
* xfs_read_icluster() to get a buffer and dinode for a given inode.
*/
struct xfs_imap {
xfs_daddr_t im_blkno; /* starting BB of inode chunk */
unsigned short im_boffset; /* inode offset in block in bytes */
};
int xfs_imap_to_bp(struct xfs_mount *mp, struct xfs_trans *tp,
struct xfs_imap *imap, struct xfs_buf **bpp);
int xfs_read_icluster(struct xfs_mount *mp, struct xfs_trans *tp,
xfs_daddr_t bno, struct xfs_buf **bpp);
void xfs_dinode_calc_crc(struct xfs_mount *mp, struct xfs_dinode *dip);
void xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,
xfs_lsn_t lsn);

3
fs/xfs/scrub/ialloc.c
View File

@ -429,7 +429,8 @@ xchk_iallocbt_check_cluster(
&XFS_RMAP_OINFO_INODES);
/* Grab the inode cluster buffer. */
error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &cluster_bp);
error = xfs_read_icluster(mp, bs->cur->bc_tp, imap.im_blkno,
&cluster_bp);
if (!xchk_btree_xref_process_error(bs->sc, bs->cur, 0, &error))
return error;

7
fs/xfs/scrub/ialloc_repair.c
View File

@ -287,7 +287,6 @@ xrep_ibt_process_cluster(
struct xrep_ibt *ri,
xfs_agblock_t cluster_bno)
{
struct xfs_imap imap;
struct xfs_buf *cluster_bp;
struct xfs_scrub *sc = ri->sc;
struct xfs_mount *mp = sc->mp;
@ -305,9 +304,9 @@ xrep_ibt_process_cluster(
* inobt because imap_to_bp directly maps the buffer without touching
* either inode btree.
*/
imap.im_blkno = xfs_agbno_to_daddr(sc->sa.pag, cluster_bno);
imap.im_boffset = 0;
error = xfs_imap_to_bp(mp, sc->tp, &imap, &cluster_bp);
error = xfs_read_icluster(mp, sc->tp,
xfs_agbno_to_daddr(sc->sa.pag, cluster_bno),
&cluster_bp);
if (error)
return error;

2
fs/xfs/xfs_icache.c
View File

@ -663,7 +663,7 @@ xfs_iget_cache_miss(
} else {
struct xfs_buf *bp;
error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &bp);
error = xfs_read_icluster(mp, tp, ip->i_imap.im_blkno, &bp);
if (error)
goto out_destroy;

3
fs/xfs/xfs_inode_item.c
View File

@ -167,7 +167,8 @@ xfs_inode_item_precommit(
* here.
*/
spin_unlock(&iip->ili_lock);
error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, &bp);
error = xfs_read_icluster(ip->i_mount, tp, ip->i_imap.im_blkno,
&bp);
if (error)
return error;

2
fs/xfs/xfs_iunlink_item.c
View File

@ -59,7 +59,7 @@ xfs_iunlink_log_dinode(
int offset;
int error;
error = xfs_imap_to_bp(tp->t_mountp, tp, &ip->i_imap, &ibp);
error = xfs_read_icluster(tp->t_mountp, tp, ip->i_imap.im_blkno, &ibp);
if (error)
return error;
/*