Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eadd102 authored by Jie Liu's avatar Jie Liu Committed by Ben Myers
Browse files

xfs: Introduce a new structure to hold transaction reservation items 



Introduce a new structure xfs_trans_res to hold transaction
reservation item info per log ticket.

We also need to improve xfs_trans_resv_calc() by initializing the
log count as well as log flags for permanent log reservation.

Signed-off-by: default avatarJie Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 9356fe22

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ typedef struct xfs_mount { 
	int			m_ialloc_blks;	/* blocks in inode allocation */

	int			m_inoalign_mask;/* mask sb_inoalignmt if used */

	uint			m_qflags;	/* quota status flags */

	struct xfs_trans_resv	m_reservations;	/* precomputed res values */

	struct xfs_trans_resv	m_resv;		/* precomputed res values */

	__uint64_t		m_maxicount;	/* maximum inode count */

	__uint64_t		m_resblks;	/* total reserved blocks */

	__uint64_t		m_resblks_avail;/* available reserved blocks */

fs/xfs/xfs_trans.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void 
xfs_trans_init(

	struct xfs_mount	*mp)

{

	xfs_trans_resv_calc(mp, &mp->m_reservations);

	xfs_trans_resv_calc(mp, &mp->m_resv);

}



/*

fs/xfs/xfs_trans_resv.c

+93 −28
Original line number Diff line number Diff line
@@ -671,32 +671,97 @@ xfs_trans_resv_calc( 
	struct xfs_mount	*mp,

	struct xfs_trans_resv	*resp)

{

	resp->tr_write = xfs_calc_write_reservation(mp);

	resp->tr_itruncate = xfs_calc_itruncate_reservation(mp);

	resp->tr_rename = xfs_calc_rename_reservation(mp);

	resp->tr_link = xfs_calc_link_reservation(mp);

	resp->tr_remove = xfs_calc_remove_reservation(mp);

	resp->tr_symlink = xfs_calc_symlink_reservation(mp);

	resp->tr_create = xfs_calc_create_reservation(mp);

	resp->tr_mkdir = xfs_calc_mkdir_reservation(mp);

	resp->tr_ifree = xfs_calc_ifree_reservation(mp);

	resp->tr_ichange = xfs_calc_ichange_reservation(mp);

	resp->tr_growdata = xfs_calc_growdata_reservation(mp);

	resp->tr_swrite = xfs_calc_swrite_reservation(mp);

	resp->tr_writeid = xfs_calc_writeid_reservation(mp);

	resp->tr_addafork = xfs_calc_addafork_reservation(mp);

	resp->tr_attrinval = xfs_calc_attrinval_reservation(mp);

	resp->tr_attrsetm = xfs_calc_attrsetm_reservation(mp);

	resp->tr_attrsetrt = xfs_calc_attrsetrt_reservation(mp);

	resp->tr_attrrm = xfs_calc_attrrm_reservation(mp);

	resp->tr_clearagi = xfs_calc_clear_agi_bucket_reservation(mp);

	resp->tr_growrtalloc = xfs_calc_growrtalloc_reservation(mp);

	resp->tr_growrtzero = xfs_calc_growrtzero_reservation(mp);

	resp->tr_growrtfree = xfs_calc_growrtfree_reservation(mp);

	resp->tr_qm_sbchange = xfs_calc_qm_sbchange_reservation(mp);

	resp->tr_qm_setqlim = xfs_calc_qm_setqlim_reservation(mp);

	resp->tr_qm_dqalloc = xfs_calc_qm_dqalloc_reservation(mp);

	resp->tr_qm_quotaoff = xfs_calc_qm_quotaoff_reservation(mp);

	resp->tr_qm_equotaoff = xfs_calc_qm_quotaoff_end_reservation(mp);

	resp->tr_sb = xfs_calc_sb_reservation(mp);

	/*

	 * The following transactions are logged in physical format and

	 * require a permanent reservation on space.

	 */

	resp->tr_write.tr_logres = xfs_calc_write_reservation(mp);

	resp->tr_write.tr_logcount = XFS_WRITE_LOG_COUNT;

	resp->tr_write.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_itruncate.tr_logres = xfs_calc_itruncate_reservation(mp);

	resp->tr_itruncate.tr_logcount = XFS_ITRUNCATE_LOG_COUNT;

	resp->tr_itruncate.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_rename.tr_logres = xfs_calc_rename_reservation(mp);

	resp->tr_rename.tr_logcount = XFS_RENAME_LOG_COUNT;

	resp->tr_rename.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_link.tr_logres = xfs_calc_link_reservation(mp);

	resp->tr_link.tr_logcount = XFS_LINK_LOG_COUNT;

	resp->tr_link.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_remove.tr_logres = xfs_calc_remove_reservation(mp);

	resp->tr_remove.tr_logcount = XFS_REMOVE_LOG_COUNT;

	resp->tr_remove.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_symlink.tr_logres = xfs_calc_symlink_reservation(mp);

	resp->tr_symlink.tr_logcount = XFS_SYMLINK_LOG_COUNT;

	resp->tr_symlink.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_create.tr_logres = xfs_calc_create_reservation(mp);

	resp->tr_create.tr_logcount = XFS_CREATE_LOG_COUNT;

	resp->tr_create.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_mkdir.tr_logres = xfs_calc_mkdir_reservation(mp);

	resp->tr_mkdir.tr_logcount = XFS_MKDIR_LOG_COUNT;

	resp->tr_mkdir.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_ifree.tr_logres = xfs_calc_ifree_reservation(mp);

	resp->tr_ifree.tr_logcount = XFS_INACTIVE_LOG_COUNT;

	resp->tr_ifree.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_addafork.tr_logres = xfs_calc_addafork_reservation(mp);

	resp->tr_addafork.tr_logcount = XFS_ADDAFORK_LOG_COUNT;

	resp->tr_addafork.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_attrinval.tr_logres = xfs_calc_attrinval_reservation(mp);

	resp->tr_attrinval.tr_logcount = XFS_ATTRINVAL_LOG_COUNT;

	resp->tr_attrinval.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_attrsetm.tr_logres = xfs_calc_attrsetm_reservation(mp);

	resp->tr_attrsetm.tr_logcount = XFS_ATTRSET_LOG_COUNT;

	resp->tr_attrsetm.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_attrrm.tr_logres = xfs_calc_attrrm_reservation(mp);

	resp->tr_attrrm.tr_logcount = XFS_ATTRRM_LOG_COUNT;

	resp->tr_attrrm.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_growrtalloc.tr_logres = xfs_calc_growrtalloc_reservation(mp);

	resp->tr_growrtalloc.tr_logcount = XFS_DEFAULT_PERM_LOG_COUNT;

	resp->tr_growrtalloc.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	resp->tr_qm_dqalloc.tr_logres = xfs_calc_qm_dqalloc_reservation(mp);

	resp->tr_qm_dqalloc.tr_logcount = XFS_WRITE_LOG_COUNT;

	resp->tr_qm_dqalloc.tr_logflags |= XFS_TRANS_PERM_LOG_RES;



	/*

	 * The following transactions are logged in logical format with

	 * a default log count.

	 */

	resp->tr_qm_sbchange.tr_logres = xfs_calc_qm_sbchange_reservation(mp);

	resp->tr_qm_sbchange.tr_logcount = XFS_DEFAULT_LOG_COUNT;



	resp->tr_qm_setqlim.tr_logres = xfs_calc_qm_setqlim_reservation(mp);

	resp->tr_qm_setqlim.tr_logcount = XFS_DEFAULT_LOG_COUNT;



	resp->tr_qm_quotaoff.tr_logres = xfs_calc_qm_quotaoff_reservation(mp);

	resp->tr_qm_quotaoff.tr_logcount = XFS_DEFAULT_LOG_COUNT;



	resp->tr_qm_equotaoff.tr_logres =

		xfs_calc_qm_quotaoff_end_reservation(mp);

	resp->tr_qm_equotaoff.tr_logcount = XFS_DEFAULT_LOG_COUNT;



	resp->tr_sb.tr_logres = xfs_calc_sb_reservation(mp);

	resp->tr_sb.tr_logcount = XFS_DEFAULT_LOG_COUNT;



	/* The following transaction are logged in logical format */

	resp->tr_ichange.tr_logres = xfs_calc_ichange_reservation(mp);

	resp->tr_growdata.tr_logres = xfs_calc_growdata_reservation(mp);

	resp->tr_swrite.tr_logres = xfs_calc_swrite_reservation(mp);

	resp->tr_writeid.tr_logres = xfs_calc_writeid_reservation(mp);

	resp->tr_attrsetrt.tr_logres = xfs_calc_attrsetrt_reservation(mp);

	resp->tr_clearagi.tr_logres = xfs_calc_clear_agi_bucket_reservation(mp);

	resp->tr_growrtzero.tr_logres = xfs_calc_growrtzero_reservation(mp);

	resp->tr_growrtfree.tr_logres = xfs_calc_growrtfree_reservation(mp);

}

fs/xfs/xfs_trans_resv.h

+68 −57
Original line number Diff line number Diff line
@@ -23,35 +23,45 @@ struct xfs_mount; 
/*

 * structure for maintaining pre-calculated transaction reservations.

 */

struct xfs_trans_res {

	uint	tr_logres;	/* log space unit in bytes per log ticket */

	int	tr_logcount;	/* number of log operations per log ticket */

	int	tr_logflags;	/* log flags, currently only used for indicating

				 * a reservation request is permanent or not */

};



struct xfs_trans_resv {

	uint	tr_write;	/* extent alloc trans */

	uint	tr_itruncate;	/* truncate trans */

	uint	tr_rename;	/* rename trans */

	uint	tr_link;	/* link trans */

	uint	tr_remove;	/* unlink trans */

	uint	tr_symlink;	/* symlink trans */

	uint	tr_create;	/* create trans */

	uint	tr_mkdir;	/* mkdir trans */

	uint	tr_ifree;	/* inode free trans */

	uint	tr_ichange;	/* inode update trans */

	uint	tr_growdata;	/* fs data section grow trans */

	uint	tr_swrite;	/* sync write inode trans */

	uint	tr_addafork;	/* cvt inode to attributed trans */

	uint	tr_writeid;	/* write setuid/setgid file */

	uint	tr_attrinval;	/* attr fork buffer invalidation */

	uint	tr_attrsetm;	/* set/create an attribute at mount time */

	uint	tr_attrsetrt;	/* set/create an attribute at runtime */

	uint	tr_attrrm;	/* remove an attribute */

	uint	tr_clearagi;	/* clear bad agi unlinked ino bucket */

	uint	tr_growrtalloc;	/* grow realtime allocations */

	uint	tr_growrtzero;	/* grow realtime zeroing */

	uint	tr_growrtfree;	/* grow realtime freeing */

	uint	tr_qm_sbchange;	/* change quota flags */

	uint	tr_qm_setqlim;	/* adjust quota limits */

	uint	tr_qm_dqalloc;	/* allocate quota on disk */

	uint	tr_qm_quotaoff;	/* turn quota off */

	uint	tr_qm_equotaoff;/* end of turn quota off */

	uint	tr_sb;		/* modify superblock */

	struct xfs_trans_res	tr_write;	/* extent alloc trans */

	struct xfs_trans_res	tr_itruncate;	/* truncate trans */

	struct xfs_trans_res	tr_rename;	/* rename trans */

	struct xfs_trans_res	tr_link;	/* link trans */

	struct xfs_trans_res	tr_remove;	/* unlink trans */

	struct xfs_trans_res	tr_symlink;	/* symlink trans */

	struct xfs_trans_res	tr_create;	/* create trans */

	struct xfs_trans_res	tr_mkdir;	/* mkdir trans */

	struct xfs_trans_res	tr_ifree;	/* inode free trans */

	struct xfs_trans_res	tr_ichange;	/* inode update trans */

	struct xfs_trans_res	tr_growdata;	/* fs data section grow trans */

	struct xfs_trans_res	tr_swrite;	/* sync write inode trans */

	struct xfs_trans_res	tr_addafork;	/* add inode attr fork trans */

	struct xfs_trans_res	tr_writeid;	/* write setuid/setgid file */

	struct xfs_trans_res	tr_attrinval;	/* attr fork buffer

						 * invalidation */

	struct xfs_trans_res	tr_attrsetm;	/* set/create an attribute at

						 * mount time */

	struct xfs_trans_res	tr_attrsetrt;	/* set/create an attribute at

						 * runtime */

	struct xfs_trans_res	tr_attrrm;	/* remove an attribute */

	struct xfs_trans_res	tr_clearagi;	/* clear agi unlinked bucket */

	struct xfs_trans_res	tr_growrtalloc;	/* grow realtime allocations */

	struct xfs_trans_res	tr_growrtzero;	/* grow realtime zeroing */

	struct xfs_trans_res	tr_growrtfree;	/* grow realtime freeing */

	struct xfs_trans_res	tr_qm_sbchange;	/* change quota flags */

	struct xfs_trans_res	tr_qm_setqlim;	/* adjust quota limits */

	struct xfs_trans_res	tr_qm_dqalloc;	/* allocate quota on disk */

	struct xfs_trans_res	tr_qm_quotaoff;	/* turn quota off */

	struct xfs_trans_res	tr_qm_equotaoff;/* end of turn quota off */

	struct xfs_trans_res	tr_sb;		/* modify superblock */

};



/*
@@ -79,39 +89,40 @@ struct xfs_trans_resv { 
	 XFS_DAENTER_BMAPS(mp, XFS_DATA_FORK) + 1)





#define	XFS_WRITE_LOG_RES(mp)	((mp)->m_reservations.tr_write)

#define	XFS_ITRUNCATE_LOG_RES(mp)   ((mp)->m_reservations.tr_itruncate)

#define	XFS_RENAME_LOG_RES(mp)	((mp)->m_reservations.tr_rename)

#define	XFS_LINK_LOG_RES(mp)	((mp)->m_reservations.tr_link)

#define	XFS_REMOVE_LOG_RES(mp)	((mp)->m_reservations.tr_remove)

#define	XFS_SYMLINK_LOG_RES(mp)	((mp)->m_reservations.tr_symlink)

#define	XFS_CREATE_LOG_RES(mp)	((mp)->m_reservations.tr_create)

#define	XFS_MKDIR_LOG_RES(mp)	((mp)->m_reservations.tr_mkdir)

#define	XFS_IFREE_LOG_RES(mp)	((mp)->m_reservations.tr_ifree)

#define	XFS_ICHANGE_LOG_RES(mp)	((mp)->m_reservations.tr_ichange)

#define	XFS_GROWDATA_LOG_RES(mp)    ((mp)->m_reservations.tr_growdata)

#define	XFS_GROWRTALLOC_LOG_RES(mp)	((mp)->m_reservations.tr_growrtalloc)

#define	XFS_GROWRTZERO_LOG_RES(mp)	((mp)->m_reservations.tr_growrtzero)

#define	XFS_GROWRTFREE_LOG_RES(mp)	((mp)->m_reservations.tr_growrtfree)

#define	XFS_SWRITE_LOG_RES(mp)	((mp)->m_reservations.tr_swrite)

#define XFS_WRITE_LOG_RES(mp)	((mp)->m_resv.tr_write.tr_logres)

#define XFS_RENAME_LOG_RES(mp)	((mp)->m_resv.tr_rename.tr_logres)

#define XFS_LINK_LOG_RES(mp)	((mp)->m_resv.tr_link.tr_logres)

#define XFS_REMOVE_LOG_RES(mp)	((mp)->m_resv.tr_remove.tr_logres)

#define XFS_SYMLINK_LOG_RES(mp)	((mp)->m_resv.tr_symlink.tr_logres)

#define XFS_CREATE_LOG_RES(mp)	((mp)->m_resv.tr_create.tr_logres)

#define XFS_MKDIR_LOG_RES(mp)	((mp)->m_resv.tr_mkdir.tr_logres)

#define XFS_IFREE_LOG_RES(mp)	((mp)->m_resv.tr_ifree.tr_logres)

#define XFS_SWRITE_LOG_RES(mp)	((mp)->m_resv.tr_swrite.tr_logres)

#define XFS_ICHANGE_LOG_RES(mp)	((mp)->m_resv.tr_ichange.tr_logres)

#define XFS_GROWDATA_LOG_RES(mp)  ((mp)->m_resv.tr_growdata.tr_logres)

#define XFS_ITRUNCATE_LOG_RES(mp) ((mp)->m_resv.tr_itruncate.tr_logres)

#define XFS_GROWRTZERO_LOG_RES(mp) ((mp)->m_resv.tr_growrtzero.tr_logres)

#define XFS_GROWRTFREE_LOG_RES(mp) ((mp)->m_resv.tr_growrtfree.tr_logres)

#define XFS_GROWRTALLOC_LOG_RES(mp) ((mp)->m_resv.tr_growrtalloc.tr_logres)



/*

 * Logging the inode timestamps on an fsync -- same as SWRITE

 * as long as SWRITE logs the entire inode core

 */

#define XFS_FSYNC_TS_LOG_RES(mp)        ((mp)->m_reservations.tr_swrite)

#define	XFS_WRITEID_LOG_RES(mp)		((mp)->m_reservations.tr_swrite)

#define	XFS_ADDAFORK_LOG_RES(mp)	((mp)->m_reservations.tr_addafork)

#define	XFS_ATTRINVAL_LOG_RES(mp)	((mp)->m_reservations.tr_attrinval)

#define	XFS_ATTRSETM_LOG_RES(mp)	((mp)->m_reservations.tr_attrsetm)

#define	XFS_ATTRSETRT_LOG_RES(mp)	((mp)->m_reservations.tr_attrsetrt)

#define	XFS_ATTRRM_LOG_RES(mp)		((mp)->m_reservations.tr_attrrm)

#define	XFS_CLEAR_AGI_BUCKET_LOG_RES(mp)  ((mp)->m_reservations.tr_clearagi)

#define XFS_QM_SBCHANGE_LOG_RES(mp)	((mp)->m_reservations.tr_qm_sbchange)

#define XFS_QM_SETQLIM_LOG_RES(mp)	((mp)->m_reservations.tr_qm_setqlim)

#define XFS_QM_DQALLOC_LOG_RES(mp)	((mp)->m_reservations.tr_qm_dqalloc)

#define XFS_QM_QUOTAOFF_LOG_RES(mp)	((mp)->m_reservations.tr_qm_quotaoff)

#define XFS_QM_QUOTAOFF_END_LOG_RES(mp)	((mp)->m_reservations.tr_qm_equotaoff)

#define XFS_SB_LOG_RES(mp)		((mp)->m_reservations.tr_sb)

#define XFS_FSYNC_TS_LOG_RES(mp) ((mp)->m_resv.tr_swrite.tr_logres)

#define XFS_WRITEID_LOG_RES(mp)	 ((mp)->m_resv.tr_swrite.tr_logres)

#define XFS_ADDAFORK_LOG_RES(mp) ((mp)->m_resv.tr_addafork.tr_logres)

#define XFS_ATTRSETM_LOG_RES(mp) ((mp)->m_resv.tr_attrsetm.tr_logres)

#define XFS_ATTRINVAL_LOG_RES(mp) ((mp)->m_resv.tr_attrinval.tr_logres)

#define XFS_ATTRSETRT_LOG_RES(mp) ((mp)->m_resv.tr_attrsetrt.tr_logres)

#define XFS_ATTRRM_LOG_RES(mp)	  ((mp)->m_resv.tr_attrrm.tr_logres)

#define XFS_SB_LOG_RES(mp)	  ((mp)->m_resv.tr_sb.tr_logres)

#define XFS_QM_SETQLIM_LOG_RES(mp) ((mp)->m_resv.tr_qm_setqlim.tr_logres)

#define XFS_QM_DQALLOC_LOG_RES(mp) ((mp)->m_resv.tr_qm_dqalloc.tr_logres)

#define XFS_QM_SBCHANGE_LOG_RES(mp) ((mp)->m_resv.tr_qm_sbchange.tr_logres)

#define XFS_QM_QUOTAOFF_LOG_RES(mp) ((mp)->m_resv.tr_qm_quotaoff.tr_logres)

#define XFS_QM_QUOTAOFF_END_LOG_RES(mp) ((mp)->m_resv.tr_qm_equotaoff.tr_logres)

#define XFS_CLEAR_AGI_BUCKET_LOG_RES(mp) ((mp)->m_resv.tr_clearagi.tr_logres)



/*

 * Various log count values.