Commit af9dcdde authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: split xfs_imap_to_bp 



Split looking up the dinode from xfs_imap_to_bp, which can be
significantly simplified as a result.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent e773f880

fs/xfs/libxfs/xfs_inode_buf.c

+4 −23
Original line number Diff line number Diff line
@@ -124,37 +124,18 @@ 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, and in the dipp parameter it returns a

 * pointer to the on-disk inode within that buffer.

 *

 * If a non-zero error is returned, then the contents of bpp and dipp are

 * undefined.

 * on-disk inode in the bpp parameter.

 */

int

xfs_imap_to_bp(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp,

	struct xfs_imap		*imap,

	struct xfs_dinode       **dipp,

	struct xfs_buf		**bpp,

	uint			buf_flags)

	struct xfs_buf		**bpp)

{

	struct xfs_buf		*bp;

	int			error;



	buf_flags |= XBF_UNMAPPED;

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap->im_blkno,

				   (int)imap->im_len, buf_flags, &bp,

	return xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, imap->im_blkno,

				   imap->im_len, XBF_UNMAPPED, bpp,

				   &xfs_inode_buf_ops);

	if (error) {

		ASSERT(error != -EAGAIN || (buf_flags & XBF_TRYLOCK));

		return error;

	}



	*bpp = bp;

	if (dipp)

		*dipp = xfs_buf_offset(bp, imap->im_boffset);

	return 0;

}



static inline struct timespec64 xfs_inode_decode_bigtime(uint64_t ts)

fs/xfs/libxfs/xfs_inode_buf.h

+2 −3
Original line number Diff line number Diff line
@@ -47,9 +47,8 @@ struct xfs_imap { 
	unsigned short	im_boffset;	/* inode offset in block in bytes */

};



int	xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,

		       struct xfs_imap *, struct xfs_dinode **,

		       struct xfs_buf **, uint);

int	xfs_imap_to_bp(struct xfs_mount *mp, struct xfs_trans *tp,

		       struct xfs_imap *imap, struct xfs_buf **bpp);

void	xfs_dinode_calc_crc(struct xfs_mount *, struct xfs_dinode *);

void	xfs_inode_to_disk(struct xfs_inode *ip, struct xfs_dinode *to,

			  xfs_lsn_t lsn);

fs/xfs/libxfs/xfs_trans_inode.c

+1 −2
Original line number Diff line number Diff line
@@ -164,8 +164,7 @@ xfs_trans_log_inode( 
		 * here.

		 */

		spin_unlock(&iip->ili_lock);

		error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, NULL,

					&bp, 0);

		error = xfs_imap_to_bp(ip->i_mount, tp, &ip->i_imap, &bp);

		if (error) {

			xfs_force_shutdown(ip->i_mount, SHUTDOWN_META_IO_ERROR);

			return;

fs/xfs/scrub/ialloc.c

+1 −2
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ xchk_iallocbt_check_cluster( 
{

	struct xfs_imap			imap;

	struct xfs_mount		*mp = bs->cur->bc_mp;

	struct xfs_dinode		*dip;

	struct xfs_buf			*cluster_bp;

	unsigned int			nr_inodes;

	xfs_agnumber_t			agno = bs->cur->bc_ag.agno;
@@ -278,7 +277,7 @@ xchk_iallocbt_check_cluster( 
			&XFS_RMAP_OINFO_INODES);



	/* Grab the inode cluster buffer. */

	error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &dip, &cluster_bp, 0);

	error = xfs_imap_to_bp(mp, bs->cur->bc_tp, &imap, &cluster_bp);

	if (!xchk_btree_xref_process_error(bs->sc, bs->cur, 0, &error))

		return error;

fs/xfs/xfs_icache.c

+3 −3
Original line number Diff line number Diff line
@@ -505,14 +505,14 @@ xfs_iget_cache_miss( 
	    (flags & XFS_IGET_CREATE) && !(mp->m_flags & XFS_MOUNT_IKEEP)) {

		VFS_I(ip)->i_generation = prandom_u32();

	} else {

		struct xfs_dinode	*dip;

		struct xfs_buf		*bp;



		error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &dip, &bp, 0);

		error = xfs_imap_to_bp(mp, tp, &ip->i_imap, &bp);

		if (error)

			goto out_destroy;



		error = xfs_inode_from_disk(ip, dip);

		error = xfs_inode_from_disk(ip,

				xfs_buf_offset(bp, ip->i_imap.im_boffset));

		if (!error)

			xfs_buf_set_ref(bp, XFS_INO_REF);

		xfs_trans_brelse(tp, bp);