Commit 2c68a1df authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the unused ic_io_size field from xlog_in_core 



ic_io_size is only used inside xlog_write_iclog, where we can just use
the count parameter intead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent cd95cb96

fs/xfs/xfs_log.c

+2 −4
Original line number Diff line number Diff line
@@ -1740,8 +1740,6 @@ xlog_write_iclog( 
		return;

	}



	iclog->ic_io_size = count;



	bio_init(&iclog->ic_bio, iclog->ic_bvec, howmany(count, PAGE_SIZE));

	bio_set_dev(&iclog->ic_bio, log->l_targ->bt_bdev);

	iclog->ic_bio.bi_iter.bi_sector = log->l_logBBstart + bno;
@@ -1751,9 +1749,9 @@ xlog_write_iclog( 
	if (need_flush)

		iclog->ic_bio.bi_opf |= REQ_PREFLUSH;



	xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, iclog->ic_io_size);

	xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count);

	if (is_vmalloc_addr(iclog->ic_data))

		flush_kernel_vmap_range(iclog->ic_data, iclog->ic_io_size);

		flush_kernel_vmap_range(iclog->ic_data, count);



	/*

	 * If this log buffer would straddle the end of the log we will have

fs/xfs/xfs_log_priv.h

+0 −3
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ typedef struct xlog_ticket { 
 * - ic_next is the pointer to the next iclog in the ring.

 * - ic_log is a pointer back to the global log structure.

 * - ic_size is the full size of the log buffer, minus the cycle headers.

 * - ic_io_size is the size of the currently pending log buffer write, which

 *	might be smaller than ic_size

 * - ic_offset is the current number of bytes written to in this iclog.

 * - ic_refcnt is bumped when someone is writing to the log.

 * - ic_state is the state of the iclog.
@@ -205,7 +203,6 @@ typedef struct xlog_in_core { 
	struct xlog_in_core	*ic_prev;

	struct xlog		*ic_log;

	u32			ic_size;

	u32			ic_io_size;

	u32			ic_offset;

	unsigned short		ic_state;

	char			*ic_datap;	/* pointer to iclog data */