Commit 4bc61983 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: refactor xfs_iget calls from log intent recovery 



Hoist the code from xfs_bui_item_recover that igets an inode and marks
it as being part of log intent recovery.  The next patch will want a
common function.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
parent 2b73a2c8

fs/xfs/libxfs/xfs_log_recover.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ void xlog_buf_readahead(struct xlog *log, xfs_daddr_t blkno, uint len, 
		const struct xfs_buf_ops *ops);

bool xlog_is_buffer_cancelled(struct xlog *log, xfs_daddr_t blkno, uint len);



int xlog_recover_iget(struct xfs_mount *mp, xfs_ino_t ino,

		struct xfs_inode **ipp);

void xlog_recover_release_intent(struct xlog *log, unsigned short intent_type,

		uint64_t intent_id);

fs/xfs/xfs_bmap_item.c

+1 −10
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "xfs_error.h"

#include "xfs_log_priv.h"

#include "xfs_log_recover.h"

#include "xfs_quota.h"



kmem_zone_t	*xfs_bui_zone;

kmem_zone_t	*xfs_bud_zone;
@@ -487,18 +486,10 @@ xfs_bui_item_recover( 
			XFS_ATTR_FORK : XFS_DATA_FORK;

	bui_type = bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK;



	/* Grab the inode. */

	error = xfs_iget(mp, NULL, bmap->me_owner, 0, 0, &ip);

	error = xlog_recover_iget(mp, bmap->me_owner, &ip);

	if (error)

		return error;



	error = xfs_qm_dqattach(ip);

	if (error)

		goto err_rele;



	if (VFS_I(ip)->i_nlink == 0)

		xfs_iflags_set(ip, XFS_IRECOVERY);



	/* Allocate transaction and do the work. */

	error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate,

			XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp);

fs/xfs/xfs_log_recover.c

+26 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include "xfs_error.h"

#include "xfs_buf_item.h"

#include "xfs_ag.h"

#include "xfs_quota.h"





#define BLK_AVG(blk1, blk2)	((blk1+blk2) >> 1)
@@ -1754,6 +1756,30 @@ xlog_recover_release_intent( 
	spin_unlock(&ailp->ail_lock);

}



int

xlog_recover_iget(

	struct xfs_mount	*mp,

	xfs_ino_t		ino,

	struct xfs_inode	**ipp)

{

	int			error;



	error = xfs_iget(mp, NULL, ino, 0, 0, ipp);

	if (error)

		return error;



	error = xfs_qm_dqattach(*ipp);

	if (error) {

		xfs_irele(*ipp);

		return error;

	}



	if (VFS_I(*ipp)->i_nlink == 0)

		xfs_iflags_set(*ipp, XFS_IRECOVERY);



	return 0;

}



/******************************************************************************

 *

 *		Log recover routines