Commit 1259845d authored by Tim Shimmin's avatar Tim Shimmin Committed by Nathan Scott
Browse files

[XFS] remove XFS_LOG_RES_DEBUG and turn on the res history all the time to 


get more useful error info on space for trans items

SGI-PV: 947110
SGI-Modid: xfs-linux-melb:xfs-kern:24886a

Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent 71df099d

fs/xfs/xfs_log.c

+2 −6
Original line number Diff line number Diff line
@@ -1591,7 +1591,6 @@ xlog_state_finish_copy(xlog_t *log, 
 * print out info relating to regions written which consume

 * the reservation

 */

#if defined(XFS_LOG_RES_DEBUG)

STATIC void

xlog_print_tic_res(xfs_mount_t *mp, xlog_ticket_t *ticket)

{
@@ -1694,9 +1693,6 @@ xlog_print_tic_res(xfs_mount_t *mp, xlog_ticket_t *ticket) 
			    ticket->t_res_arr[i].r_len);

	}

}

#else

#define xlog_print_tic_res(mp, ticket)

#endif



/*

 * Write some region out to in-core log

fs/xfs/xfs_log.h

+1 −10
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) 




/* Region types for iovec's i_type */

#if defined(XFS_LOG_RES_DEBUG)

#define XLOG_REG_TYPE_BFORMAT		1

#define XLOG_REG_TYPE_BCHUNK		2

#define XLOG_REG_TYPE_EFI_FORMAT	3
@@ -117,21 +116,13 @@ static inline xfs_lsn_t _lsn_cmp(xfs_lsn_t lsn1, xfs_lsn_t lsn2) 
#define XLOG_REG_TYPE_COMMIT		18

#define XLOG_REG_TYPE_TRANSHDR		19

#define XLOG_REG_TYPE_MAX		19

#endif



#if defined(XFS_LOG_RES_DEBUG)

#define XLOG_VEC_SET_TYPE(vecp, t) ((vecp)->i_type = (t))

#else

#define XLOG_VEC_SET_TYPE(vecp, t)

#endif





typedef struct xfs_log_iovec {

	xfs_caddr_t		i_addr;		/* beginning address of region */

	int		i_len;		/* length in bytes of region */

#if defined(XFS_LOG_RES_DEBUG)

	uint		i_type;		/* type of region */

#endif

} xfs_log_iovec_t;



typedef void* xfs_log_ticket_t;

fs/xfs/xfs_log_priv.h

+3 −12
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ typedef __uint32_t xlog_tid_t; 




/* Ticket reservation region accounting */ 

#if defined(XFS_LOG_RES_DEBUG)

#define XLOG_TIC_LEN_MAX	15

#define XLOG_TIC_RESET_RES(t) ((t)->t_res_num = \

				(t)->t_res_arr_sum = (t)->t_res_num_ophdrs = 0)
@@ -278,15 +277,9 @@ typedef __uint32_t xlog_tid_t; 
 * we don't care about.

 */

typedef struct xlog_res {

	uint	r_len;

	uint	r_type;

	uint	r_len;	/* region length		:4 */

	uint	r_type;	/* region's transaction type	:4 */

} xlog_res_t;

#else

#define XLOG_TIC_RESET_RES(t)

#define XLOG_TIC_ADD_OPHDR(t)

#define XLOG_TIC_ADD_REGION(t, len, type)

#endif





typedef struct xlog_ticket {

	sv_t		   t_sema;	 /* sleep on this semaphore      : 20 */
@@ -301,14 +294,12 @@ typedef struct xlog_ticket { 
	char		   t_flags;	 /* properties of reservation	 : 1  */

	uint		   t_trans_type; /* transaction type             : 4  */



#if defined (XFS_LOG_RES_DEBUG)

        /* reservation array fields */

	uint		   t_res_num;                    /* num in array : 4 */

	xlog_res_t	   t_res_arr[XLOG_TIC_LEN_MAX];  /* array of res : X */ 

	uint		   t_res_num_ophdrs;		 /* num op hdrs  : 4 */

	uint		   t_res_arr_sum;		 /* array sum    : 4 */

	uint		   t_res_o_flow;		 /* sum overflow : 4 */

#endif

	xlog_res_t	   t_res_arr[XLOG_TIC_LEN_MAX];  /* array of res : 8 * 15 */ 

} xlog_ticket_t;



#endif