xfs: remove the b_io_length field in struct xfs_buf (8124b9b6) · Commits · 戴 / test

fs/xfs/xfs_buf.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -264,7 +264,6 @@ _xfs_buf_alloc(
		bp->b_maps[i].bm_len = map[i].bm_len;
		bp->b_length += map[i].bm_len;
		}
		bp->b_io_length = bp->b_length;

		atomic_set(&bp->b_pin_count, 0);
		init_waitqueue_head(&bp->b_waiters);
		@@ -1408,7 +1407,7 @@ _xfs_buf_ioapply(
		* subsequent call.
		*/
		offset = bp->b_offset;
		size = BBTOB(bp->b_io_length);
		size = BBTOB(bp->b_length);
		blk_start_plug(&plug);
		for (i = 0; i < bp->b_map_count; i++) {
		xfs_buf_ioapply_map(bp, i, &offset, &size, op, op_flags);
		@@ -1541,7 +1540,7 @@ xfs_buf_zero(
		page_offset = (boff + bp->b_offset) & ~PAGE_MASK;
		page = bp->b_pages[page_index];
		csize = min_t(size_t, PAGE_SIZE - page_offset,
		BBTOB(bp->b_io_length) - boff);
		BBTOB(bp->b_length) - boff);

		ASSERT((csize + page_offset) <= PAGE_SIZE);

+0 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,6 @@ typedef struct xfs_buf {
		struct xfs_buf_map b_maps; / compound buffer map */
		struct xfs_buf_map __b_map; /* inline compound buffer map */
		int b_map_count;
		int b_io_length; /* IO size in BBs */
		atomic_t b_pin_count; /* pin count */
		atomic_t b_io_remaining; /* #outstanding I/O requests */
		unsigned int b_page_count; /* size of page array */

+4 −5

Original line number	Diff line number	Diff line
		@@ -2086,7 +2086,7 @@ xlog_recover_do_inode_buffer(
		if (xfs_sb_version_hascrc(&mp->m_sb))
		bp->b_ops = &xfs_inode_buf_ops;

		inodes_per_buf = BBTOB(bp->b_io_length) >> mp->m_sb.sb_inodelog;
		inodes_per_buf = BBTOB(bp->b_length) >> mp->m_sb.sb_inodelog;
		for (i = 0; i < inodes_per_buf; i++) {
		next_unlinked_offset = (i * mp->m_sb.sb_inodesize) +
		offsetof(xfs_dinode_t, di_next_unlinked);
		@@ -2128,8 +2128,7 @@ xlog_recover_do_inode_buffer(

		ASSERT(item->ri_buf[item_index].i_addr != NULL);
		ASSERT((item->ri_buf[item_index].i_len % XFS_BLF_CHUNK) == 0);
		ASSERT((reg_buf_offset + reg_buf_bytes) <=
		BBTOB(bp->b_io_length));
		ASSERT((reg_buf_offset + reg_buf_bytes) <= BBTOB(bp->b_length));

		/*
		* The current logged region contains a copy of the
		@@ -2594,7 +2593,7 @@ xlog_recover_do_reg_buffer(
		ASSERT(nbits > 0);
		ASSERT(item->ri_buf[i].i_addr != NULL);
		ASSERT(item->ri_buf[i].i_len % XFS_BLF_CHUNK == 0);
		ASSERT(BBTOB(bp->b_io_length) >=
		ASSERT(BBTOB(bp->b_length) >=
		((uint)bit << XFS_BLF_SHIFT) + (nbits << XFS_BLF_SHIFT));

		/*
		@@ -2817,7 +2816,7 @@ xlog_recover_buffer_pass2(
		*/
		if (XFS_DINODE_MAGIC ==
		be16_to_cpu(((__be16 )xfs_buf_offset(bp, 0))) &&
		(BBTOB(bp->b_io_length) != M_IGEO(log->l_mp)->inode_cluster_size)) {
		(BBTOB(bp->b_length) != M_IGEO(log->l_mp)->inode_cluster_size)) {
		xfs_buf_stale(bp);
		error = xfs_bwrite(bp);
		} else {