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

Commit 710b1e2c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: remove transaction types 



These aren't used for CIL-style logging and can be dropped.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 253f4911

fs/xfs/libxfs/xfs_log_format.h

+5 −0
Original line number Diff line number Diff line
@@ -211,6 +211,11 @@ typedef struct xfs_trans_header { 


#define	XFS_TRANS_HEADER_MAGIC	0x5452414e	/* TRAN */



/*

 * The only type valid for th_type in CIL-enabled file system logs:

 */

#define XFS_TRANS_CHECKPOINT	40



/*

 * Log item types.

 */

fs/xfs/libxfs/xfs_shared.h

+0 −97
Original line number Diff line number Diff line
@@ -55,103 +55,6 @@ extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops; 
extern const struct xfs_buf_ops xfs_symlink_buf_ops;

extern const struct xfs_buf_ops xfs_rtbuf_ops;



/*

 * Transaction types.  Used to distinguish types of buffers. These never reach

 * the log.

 */

#define XFS_TRANS_SETATTR_NOT_SIZE	1

#define XFS_TRANS_SETATTR_SIZE		2

#define XFS_TRANS_INACTIVE		3

#define XFS_TRANS_CREATE		4

#define XFS_TRANS_CREATE_TRUNC		5

#define XFS_TRANS_TRUNCATE_FILE		6

#define XFS_TRANS_REMOVE		7

#define XFS_TRANS_LINK			8

#define XFS_TRANS_RENAME		9

#define XFS_TRANS_MKDIR			10

#define XFS_TRANS_RMDIR			11

#define XFS_TRANS_SYMLINK		12

#define XFS_TRANS_SET_DMATTRS		13

#define XFS_TRANS_GROWFS		14

#define XFS_TRANS_STRAT_WRITE		15

#define XFS_TRANS_DIOSTRAT		16

/* 17 was XFS_TRANS_WRITE_SYNC */

#define	XFS_TRANS_WRITEID		18

#define	XFS_TRANS_ADDAFORK		19

#define	XFS_TRANS_ATTRINVAL		20

#define	XFS_TRANS_ATRUNCATE		21

#define	XFS_TRANS_ATTR_SET		22

#define	XFS_TRANS_ATTR_RM		23

#define	XFS_TRANS_ATTR_FLAG		24

#define	XFS_TRANS_CLEAR_AGI_BUCKET	25

#define XFS_TRANS_SB_CHANGE		26

/*

 * Dummy entries since we use the transaction type to index into the

 * trans_type[] in xlog_recover_print_trans_head()

 */

#define XFS_TRANS_DUMMY1		27

#define XFS_TRANS_DUMMY2		28

#define XFS_TRANS_QM_QUOTAOFF		29

#define XFS_TRANS_QM_DQALLOC		30

#define XFS_TRANS_QM_SETQLIM		31

#define XFS_TRANS_QM_DQCLUSTER		32

#define XFS_TRANS_QM_QINOCREATE		33

#define XFS_TRANS_QM_QUOTAOFF_END	34

#define XFS_TRANS_FSYNC_TS		35

#define	XFS_TRANS_GROWFSRT_ALLOC	36

#define	XFS_TRANS_GROWFSRT_ZERO		37

#define	XFS_TRANS_GROWFSRT_FREE		38

#define	XFS_TRANS_SWAPEXT		39

#define	XFS_TRANS_CHECKPOINT		40

#define	XFS_TRANS_ICREATE		41

#define	XFS_TRANS_CREATE_TMPFILE	42

#define	XFS_TRANS_TYPE_MAX		43

/* new transaction types need to be reflected in xfs_logprint(8) */



#define XFS_TRANS_TYPES \

	{ XFS_TRANS_SETATTR_NOT_SIZE,	"SETATTR_NOT_SIZE" }, \

	{ XFS_TRANS_SETATTR_SIZE,	"SETATTR_SIZE" }, \

	{ XFS_TRANS_INACTIVE,		"INACTIVE" }, \

	{ XFS_TRANS_CREATE,		"CREATE" }, \

	{ XFS_TRANS_CREATE_TRUNC,	"CREATE_TRUNC" }, \

	{ XFS_TRANS_TRUNCATE_FILE,	"TRUNCATE_FILE" }, \

	{ XFS_TRANS_REMOVE,		"REMOVE" }, \

	{ XFS_TRANS_LINK,		"LINK" }, \

	{ XFS_TRANS_RENAME,		"RENAME" }, \

	{ XFS_TRANS_MKDIR,		"MKDIR" }, \

	{ XFS_TRANS_RMDIR,		"RMDIR" }, \

	{ XFS_TRANS_SYMLINK,		"SYMLINK" }, \

	{ XFS_TRANS_SET_DMATTRS,	"SET_DMATTRS" }, \

	{ XFS_TRANS_GROWFS,		"GROWFS" }, \

	{ XFS_TRANS_STRAT_WRITE,	"STRAT_WRITE" }, \

	{ XFS_TRANS_DIOSTRAT,		"DIOSTRAT" }, \

	{ XFS_TRANS_WRITEID,		"WRITEID" }, \

	{ XFS_TRANS_ADDAFORK,		"ADDAFORK" }, \

	{ XFS_TRANS_ATTRINVAL,		"ATTRINVAL" }, \

	{ XFS_TRANS_ATRUNCATE,		"ATRUNCATE" }, \

	{ XFS_TRANS_ATTR_SET,		"ATTR_SET" }, \

	{ XFS_TRANS_ATTR_RM,		"ATTR_RM" }, \

	{ XFS_TRANS_ATTR_FLAG,		"ATTR_FLAG" }, \

	{ XFS_TRANS_CLEAR_AGI_BUCKET,	"CLEAR_AGI_BUCKET" }, \

	{ XFS_TRANS_SB_CHANGE,		"SBCHANGE" }, \

	{ XFS_TRANS_DUMMY1,		"DUMMY1" }, \

	{ XFS_TRANS_DUMMY2,		"DUMMY2" }, \

	{ XFS_TRANS_QM_QUOTAOFF,	"QM_QUOTAOFF" }, \

	{ XFS_TRANS_QM_DQALLOC,		"QM_DQALLOC" }, \

	{ XFS_TRANS_QM_SETQLIM,		"QM_SETQLIM" }, \

	{ XFS_TRANS_QM_DQCLUSTER,	"QM_DQCLUSTER" }, \

	{ XFS_TRANS_QM_QINOCREATE,	"QM_QINOCREATE" }, \

	{ XFS_TRANS_QM_QUOTAOFF_END,	"QM_QOFF_END" }, \

	{ XFS_TRANS_FSYNC_TS,		"FSYNC_TS" }, \

	{ XFS_TRANS_GROWFSRT_ALLOC,	"GROWFSRT_ALLOC" }, \

	{ XFS_TRANS_GROWFSRT_ZERO,	"GROWFSRT_ZERO" }, \

	{ XFS_TRANS_GROWFSRT_FREE,	"GROWFSRT_FREE" }, \

	{ XFS_TRANS_SWAPEXT,		"SWAPEXT" }, \

	{ XFS_TRANS_CHECKPOINT,		"CHECKPOINT" }, \

	{ XFS_TRANS_ICREATE,		"ICREATE" }, \

	{ XFS_TRANS_CREATE_TMPFILE,	"CREATE_TMPFILE" }, \

	{ XLOG_UNMOUNT_REC_TYPE,	"UNMOUNT" }



/*

 * This structure is used to track log items associated with

 * a transaction.  It points to the log item and keeps some

fs/xfs/xfs_log.c

+2 −56
Original line number Diff line number Diff line
@@ -435,8 +435,7 @@ xfs_log_reserve( 
	int		 	cnt,

	struct xlog_ticket	**ticp,

	__uint8_t	 	client,

	bool			permanent,

	uint		 	t_type)

	bool			permanent)

{

	struct xlog		*log = mp->m_log;

	struct xlog_ticket	*tic;
@@ -456,7 +455,6 @@ xfs_log_reserve( 
	if (!tic)

		return -ENOMEM;



	tic->t_trans_type = t_type;

	*ticp = tic;



	xlog_grant_push_ail(log, tic->t_cnt ? tic->t_unit_res * tic->t_cnt
@@ -823,8 +821,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
	} while (iclog != first_iclog);

#endif

	if (! (XLOG_FORCED_SHUTDOWN(log))) {

		error = xfs_log_reserve(mp, 600, 1, &tic,

					XFS_LOG, 0, XLOG_UNMOUNT_REC_TYPE);

		error = xfs_log_reserve(mp, 600, 1, &tic, XFS_LOG, 0);

		if (!error) {

			/* the data section must be 32 bit size aligned */

			struct {
@@ -2032,58 +2029,8 @@ xlog_print_tic_res( 
	    REG_TYPE_STR(ICREATE, "inode create")

	};

#undef REG_TYPE_STR

#define TRANS_TYPE_STR(type)	[XFS_TRANS_##type] = #type

	static char *trans_type_str[XFS_TRANS_TYPE_MAX] = {

	    TRANS_TYPE_STR(SETATTR_NOT_SIZE),

	    TRANS_TYPE_STR(SETATTR_SIZE),

	    TRANS_TYPE_STR(INACTIVE),

	    TRANS_TYPE_STR(CREATE),

	    TRANS_TYPE_STR(CREATE_TRUNC),

	    TRANS_TYPE_STR(TRUNCATE_FILE),

	    TRANS_TYPE_STR(REMOVE),

	    TRANS_TYPE_STR(LINK),

	    TRANS_TYPE_STR(RENAME),

	    TRANS_TYPE_STR(MKDIR),

	    TRANS_TYPE_STR(RMDIR),

	    TRANS_TYPE_STR(SYMLINK),

	    TRANS_TYPE_STR(SET_DMATTRS),

	    TRANS_TYPE_STR(GROWFS),

	    TRANS_TYPE_STR(STRAT_WRITE),

	    TRANS_TYPE_STR(DIOSTRAT),

	    TRANS_TYPE_STR(WRITEID),

	    TRANS_TYPE_STR(ADDAFORK),

	    TRANS_TYPE_STR(ATTRINVAL),

	    TRANS_TYPE_STR(ATRUNCATE),

	    TRANS_TYPE_STR(ATTR_SET),

	    TRANS_TYPE_STR(ATTR_RM),

	    TRANS_TYPE_STR(ATTR_FLAG),

	    TRANS_TYPE_STR(CLEAR_AGI_BUCKET),

	    TRANS_TYPE_STR(SB_CHANGE),

	    TRANS_TYPE_STR(DUMMY1),

	    TRANS_TYPE_STR(DUMMY2),

	    TRANS_TYPE_STR(QM_QUOTAOFF),

	    TRANS_TYPE_STR(QM_DQALLOC),

	    TRANS_TYPE_STR(QM_SETQLIM),

	    TRANS_TYPE_STR(QM_DQCLUSTER),

	    TRANS_TYPE_STR(QM_QINOCREATE),

	    TRANS_TYPE_STR(QM_QUOTAOFF_END),

	    TRANS_TYPE_STR(FSYNC_TS),

	    TRANS_TYPE_STR(GROWFSRT_ALLOC),

	    TRANS_TYPE_STR(GROWFSRT_ZERO),

	    TRANS_TYPE_STR(GROWFSRT_FREE),

	    TRANS_TYPE_STR(SWAPEXT),

	    TRANS_TYPE_STR(CHECKPOINT),

	    TRANS_TYPE_STR(ICREATE),

	    TRANS_TYPE_STR(CREATE_TMPFILE)

	};

#undef TRANS_TYPE_STR



	xfs_warn(mp, "xlog_write: reservation summary:");

	xfs_warn(mp, "  trans type  = %s (%u)",

		 ((ticket->t_trans_type <= 0 ||

		   ticket->t_trans_type > XFS_TRANS_TYPE_MAX) ?

		  "bad-trans-type" : trans_type_str[ticket->t_trans_type]),

		 ticket->t_trans_type);

	xfs_warn(mp, "  unit res    = %d bytes",

		 ticket->t_unit_res);

	xfs_warn(mp, "  current res = %d bytes",
@@ -3709,7 +3656,6 @@ xlog_ticket_alloc( 
	tic->t_tid		= prandom_u32();

	tic->t_clientid		= client;

	tic->t_flags		= XLOG_TIC_INITED;

	tic->t_trans_type	= 0;

	if (permanent)

		tic->t_flags |= XLOG_TIC_PERM_RESERV;

fs/xfs/xfs_log.h

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ int xfs_log_reserve(struct xfs_mount *mp, 
			  int		   count,

			  struct xlog_ticket **ticket,

			  __uint8_t	   clientid,

			  bool		   permanent,

			  uint		   t_type);

			  bool		   permanent);

int	  xfs_log_regrant(struct xfs_mount *mp, struct xlog_ticket *tic);

int	  xfs_log_unmount_write(struct xfs_mount *mp);

void      xfs_log_unmount(struct xfs_mount *mp);

fs/xfs/xfs_log_cil.c

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ xlog_cil_ticket_alloc( 


	tic = xlog_ticket_alloc(log, 0, 1, XFS_TRANSACTION, 0,

				KM_SLEEP|KM_NOFS);

	tic->t_trans_type = XFS_TRANS_CHECKPOINT;



	/*

	 * set the current reservation to zero so we know to steal the basic