Re: [PATCH v22 03/16] xfs: refactor xfs_iget calls from log intent recovery

Allison Henderson
2021-07-30T09:17:46Z

On 7/28/21 4:54 AM, Chandan Babu R wrote:
> On 27 Jul 2021 at 11:50, Allison Henderson wrote:
>> 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.
>
> A straight forward hoist.
>
> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Great, thank you!
Allison

>
>>
>> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
>> Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>> ---
>> fs/xfs/libxfs/xfs_log_recover.h | 2 ++
>> fs/xfs/xfs_bmap_item.c | 11 +----------
>> fs/xfs/xfs_log_recover.c | 26 ++++++++++++++++++++++++++
>> 3 files changed, 29 insertions(+), 10 deletions(-)
>>
>> diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
>> index 3cca2bf..ff69a00 100644
>> --- a/fs/xfs/libxfs/xfs_log_recover.h
>> +++ b/fs/xfs/libxfs/xfs_log_recover.h
>> @@ -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);
>>
>> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
>> index e3a6919..e587a00 100644
>> --- a/fs/xfs/xfs_bmap_item.c
>> +++ b/fs/xfs/xfs_bmap_item.c
>> @@ -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);
>> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
>> index ec4ccae..12118d5 100644
>> --- a/fs/xfs/xfs_log_recover.c
>> +++ b/fs/xfs/xfs_log_recover.c
>> @@ -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)
>>
>> @@ -1756,6 +1758,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
>
>