Commit 6731f85d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: remove the xlog_in_core_t typedef 



Switch the few remaining users to use the underlying struct directly.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent bc2dd9f2

fs/xfs/xfs_log.c

+9 −9
Original line number Diff line number Diff line
@@ -1368,8 +1368,8 @@ xlog_alloc_log( 
	int			num_bblks)

{

	struct xlog		*log;

	xlog_in_core_t		**iclogp;

	xlog_in_core_t		*iclog, *prev_iclog=NULL;

	struct xlog_in_core	**iclogp;

	struct xlog_in_core	*iclog, *prev_iclog = NULL;

	int			i;

	int			error = -ENOMEM;

	uint			log2_size = 0;
@@ -1815,7 +1815,7 @@ STATIC void 
xlog_dealloc_log(

	struct xlog		*log)

{

	xlog_in_core_t	*iclog, *next_iclog;

	struct xlog_in_core	*iclog, *next_iclog;

	int			i;



	/*
@@ -3293,7 +3293,7 @@ xlog_verify_iclog( 
	int			count)

{

	struct xlog_rec_header	*rhead = iclog->ic_header;

	xlog_in_core_t		*icptr;

	struct xlog_in_core	*icptr;

	void			*base_ptr, *ptr;

	ptrdiff_t		field_offset;

	uint8_t			clientid;
@@ -3483,9 +3483,8 @@ STATIC int 
xlog_iclogs_empty(

	struct xlog		*log)

{

	xlog_in_core_t	*iclog;

	struct xlog_in_core	*iclog = log->l_iclog;



	iclog = log->l_iclog;

	do {

		/* endianness does not matter here, zero is zero in

		 * any language.
@@ -3494,6 +3493,7 @@ xlog_iclogs_empty( 
			return 0;

		iclog = iclog->ic_next;

	} while (iclog != log->l_iclog);



	return 1;

}

fs/xfs/xfs_log_priv.h

+3 −3
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct xlog_ticket { 
 * We'll put all the read-only and l_icloglock fields in the first cacheline,

 * and move everything else out to subsequent cachelines.

 */

typedef struct xlog_in_core {

struct xlog_in_core {

	wait_queue_head_t	ic_force_wait;

	wait_queue_head_t	ic_write_wait;

	struct xlog_in_core	*ic_next;
@@ -204,7 +204,7 @@ typedef struct xlog_in_core { 
	struct work_struct	ic_end_io_work;

	struct bio		ic_bio;

	struct bio_vec		ic_bvec[];

} xlog_in_core_t;

};



/*

 * The CIL context is used to aggregate per-transaction details as well be
@@ -418,7 +418,7 @@ struct xlog { 
						/* waiting for iclog flush */

	int			l_covered_state;/* state of "covering disk

						 * log entries" */

	xlog_in_core_t		*l_iclog;       /* head log queue	*/

	struct xlog_in_core	*l_iclog;       /* head log queue	*/

	spinlock_t		l_icloglock;    /* grab to change iclog state */

	int			l_curr_cycle;   /* Cycle number of log writes */

	int			l_prev_cycle;   /* Cycle number before last