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

xfs: move the di_nblocks field to struct xfs_inode 



In preparation of removing the historic icinode struct, move the nblocks
field into the containing xfs_inode structure.

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 13d2c10b

fs/xfs/libxfs/xfs_bmap.c

+6 −6
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ xfs_bmap_btree_to_extents( 
		return error;

	xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, whichfork);

	xfs_bmap_add_free(cur->bc_tp, cbno, 1, &oinfo);

	ip->i_d.di_nblocks--;

	ip->i_nblocks--;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L);

	xfs_trans_binval(tp, cbp);

	if (cur->bc_bufs[0] == cbp)
@@ -726,7 +726,7 @@ xfs_bmap_extents_to_btree( 
	       args.agno >= XFS_FSB_TO_AGNO(mp, tp->t_firstblock));

	tp->t_firstblock = args.fsbno;

	cur->bc_ino.allocated++;

	ip->i_d.di_nblocks++;

	ip->i_nblocks++;

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L);

	error = xfs_trans_get_buf(tp, mp->m_ddev_targp,

			XFS_FSB_TO_DADDR(mp, args.fsbno),
@@ -908,7 +908,7 @@ xfs_bmap_local_to_extents( 
	xfs_iext_insert(ip, &icur, &rec, 0);



	ifp->if_nextents = 1;

	ip->i_d.di_nblocks = 1;

	ip->i_nblocks = 1;

	xfs_trans_mod_dquot_byino(tp, ip,

		XFS_TRANS_DQ_BCOUNT, 1L);

	flags |= xfs_ilog_fext(whichfork);
@@ -3443,7 +3443,7 @@ xfs_bmap_btalloc_accounting( 
	}



	/* data/attr fork only */

	ap->ip->i_d.di_nblocks += args->len;

	ap->ip->i_nblocks += args->len;

	xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);

	if (ap->wasdel) {

		ap->ip->i_delayed_blks -= args->len;
@@ -4764,7 +4764,7 @@ xfs_bmapi_remap( 
		ASSERT(got.br_startoff - bno >= len);

	}



	ip->i_d.di_nblocks += len;

	ip->i_nblocks += len;

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (ifp->if_flags & XFS_IFBROOT) {
@@ -5355,7 +5355,7 @@ xfs_bmap_del_extent_real( 
	 * Adjust inode # blocks in the file.

	 */

	if (nblks)

		ip->i_d.di_nblocks -= nblks;

		ip->i_nblocks -= nblks;

	/*

	 * Adjust quota data.

	 */

fs/xfs/libxfs/xfs_bmap_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ xfs_bmbt_alloc_block( 
	ASSERT(args.len == 1);

	cur->bc_tp->t_firstblock = args.fsbno;

	cur->bc_ino.allocated++;

	cur->bc_ino.ip->i_d.di_nblocks++;

	cur->bc_ino.ip->i_nblocks++;

	xfs_trans_log_inode(args.tp, cur->bc_ino.ip, XFS_ILOG_CORE);

	xfs_trans_mod_dquot_byino(args.tp, cur->bc_ino.ip,

			XFS_TRANS_DQ_BCOUNT, 1L);
@@ -287,7 +287,7 @@ xfs_bmbt_free_block( 


	xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, cur->bc_ino.whichfork);

	xfs_bmap_add_free(cur->bc_tp, fsbno, 1, &oinfo);

	ip->i_d.di_nblocks--;

	ip->i_nblocks--;



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, -1L);

fs/xfs/libxfs/xfs_da_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -2145,7 +2145,7 @@ xfs_da_grow_inode_int( 
	struct xfs_trans	*tp = args->trans;

	struct xfs_inode	*dp = args->dp;

	int			w = args->whichfork;

	xfs_rfsblock_t		nblks = dp->i_d.di_nblocks;

	xfs_rfsblock_t		nblks = dp->i_nblocks;

	struct xfs_bmbt_irec	map, *mapp;

	int			nmap, error, got, i, mapi;
@@ -2211,7 +2211,7 @@ xfs_da_grow_inode_int( 
	}



	/* account for newly allocated blocks in reserved blocks total */

	args->total -= dp->i_d.di_nblocks - nblks;

	args->total -= dp->i_nblocks - nblks;



out_free_map:

	if (mapp != &map)

fs/xfs/libxfs/xfs_inode_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ xfs_inode_from_disk( 
	inode->i_ctime = xfs_inode_from_disk_ts(from, from->di_ctime);



	ip->i_disk_size = be64_to_cpu(from->di_size);

	to->di_nblocks = be64_to_cpu(from->di_nblocks);

	ip->i_nblocks = be64_to_cpu(from->di_nblocks);

	to->di_extsize = be32_to_cpu(from->di_extsize);

	to->di_forkoff = from->di_forkoff;

	to->di_flags	= be16_to_cpu(from->di_flags);
@@ -306,7 +306,7 @@ xfs_inode_to_disk( 
	to->di_mode = cpu_to_be16(inode->i_mode);



	to->di_size = cpu_to_be64(ip->i_disk_size);

	to->di_nblocks = cpu_to_be64(from->di_nblocks);

	to->di_nblocks = cpu_to_be64(ip->i_nblocks);

	to->di_extsize = cpu_to_be32(from->di_extsize);

	to->di_nextents = cpu_to_be32(xfs_ifork_nextents(&ip->i_df));

	to->di_anextents = cpu_to_be16(xfs_ifork_nextents(ip->i_afp));

fs/xfs/libxfs/xfs_inode_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ struct xfs_dinode; 
 */

struct xfs_icdinode {

	uint16_t	di_flushiter;	/* incremented on flush */

	xfs_rfsblock_t	di_nblocks;	/* # of direct & btree blocks used */

	xfs_extlen_t	di_extsize;	/* basic/minimum extent size for file */

	uint8_t		di_forkoff;	/* attr fork offs, <<3 for 64b align */

	uint16_t	di_flags;	/* random flags, XFS_DIFLAG_... */