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

Commit 4139b3b3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: kill XLOG_VEC_SET_TYPE 



This macro only obsfucates the log item type assignments, so kill it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent 0cadda1c

fs/xfs/quota/xfs_dquot_item.c

+3 −3
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ xfs_qm_dquot_logitem_format( 


	logvec->i_addr = (xfs_caddr_t)&logitem->qli_format;

	logvec->i_len  = sizeof(xfs_dq_logformat_t);

	XLOG_VEC_SET_TYPE(logvec, XLOG_REG_TYPE_QFORMAT);

	logvec->i_type = XLOG_REG_TYPE_QFORMAT;

	logvec++;

	logvec->i_addr = (xfs_caddr_t)&logitem->qli_dquot->q_core;

	logvec->i_len  = sizeof(xfs_disk_dquot_t);

	XLOG_VEC_SET_TYPE(logvec, XLOG_REG_TYPE_DQUOT);

	logvec->i_type = XLOG_REG_TYPE_DQUOT;



	ASSERT(2 == logitem->qli_item.li_desc->lid_size);

	logitem->qli_format.qlf_size = 2;
@@ -466,7 +466,7 @@ xfs_qm_qoff_logitem_format(xfs_qoff_logitem_t *qf, 


	log_vector->i_addr = (xfs_caddr_t)&(qf->qql_format);

	log_vector->i_len = sizeof(xfs_qoff_logitem_t);

	XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_QUOTAOFF);

	log_vector->i_type = XLOG_REG_TYPE_QUOTAOFF;

	qf->qql_format.qf_size = 1;

}

fs/xfs/xfs_buf_item.c

+4 −4
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ xfs_buf_item_format( 
		       ((bip->bli_format.blf_map_size - 1) * sizeof(uint)));

	vecp->i_addr = (xfs_caddr_t)&bip->bli_format;

	vecp->i_len = base_size;

	XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BFORMAT);

	vecp->i_type = XLOG_REG_TYPE_BFORMAT;

	vecp++;

	nvecs = 1;
@@ -297,14 +297,14 @@ xfs_buf_item_format( 
			buffer_offset = first_bit * XFS_BLI_CHUNK;

			vecp->i_addr = xfs_buf_offset(bp, buffer_offset);

			vecp->i_len = nbits * XFS_BLI_CHUNK;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK);

			vecp->i_type = XLOG_REG_TYPE_BCHUNK;

			nvecs++;

			break;

		} else if (next_bit != last_bit + 1) {

			buffer_offset = first_bit * XFS_BLI_CHUNK;

			vecp->i_addr = xfs_buf_offset(bp, buffer_offset);

			vecp->i_len = nbits * XFS_BLI_CHUNK;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK);

			vecp->i_type = XLOG_REG_TYPE_BCHUNK;

			nvecs++;

			vecp++;

			first_bit = next_bit;
@@ -316,7 +316,7 @@ xfs_buf_item_format( 
			buffer_offset = first_bit * XFS_BLI_CHUNK;

			vecp->i_addr = xfs_buf_offset(bp, buffer_offset);

			vecp->i_len = nbits * XFS_BLI_CHUNK;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_BCHUNK);

			vecp->i_type = XLOG_REG_TYPE_BCHUNK;

/* You would think we need to bump the nvecs here too, but we do not

 * this number is used by recovery, and it gets confused by the boundary

 * split here

fs/xfs/xfs_extfree_item.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ xfs_efi_item_format(xfs_efi_log_item_t *efip, 


	log_vector->i_addr = (xfs_caddr_t)&(efip->efi_format);

	log_vector->i_len = size;

	XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_EFI_FORMAT);

	log_vector->i_type = XLOG_REG_TYPE_EFI_FORMAT;

	ASSERT(size >= sizeof(xfs_efi_log_format_t));

}
@@ -406,7 +406,7 @@ xfs_efd_item_format(xfs_efd_log_item_t *efdp, 


	log_vector->i_addr = (xfs_caddr_t)&(efdp->efd_format);

	log_vector->i_len = size;

	XLOG_VEC_SET_TYPE(log_vector, XLOG_REG_TYPE_EFD_FORMAT);

	log_vector->i_type = XLOG_REG_TYPE_EFD_FORMAT;

	ASSERT(size >= sizeof(xfs_efd_log_format_t));

}

fs/xfs/xfs_inode_item.c

+9 −9
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ xfs_inode_item_format( 


	vecp->i_addr = (xfs_caddr_t)&iip->ili_format;

	vecp->i_len  = sizeof(xfs_inode_log_format_t);

	XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IFORMAT);

	vecp->i_type = XLOG_REG_TYPE_IFORMAT;

	vecp++;

	nvecs	     = 1;
@@ -279,7 +279,7 @@ xfs_inode_item_format( 


	vecp->i_addr = (xfs_caddr_t)&ip->i_d;

	vecp->i_len  = sizeof(struct xfs_icdinode);

	XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_ICORE);

	vecp->i_type = XLOG_REG_TYPE_ICORE;

	vecp++;

	nvecs++;

	iip->ili_format.ilf_fields |= XFS_ILOG_CORE;
@@ -336,7 +336,7 @@ xfs_inode_item_format( 
				vecp->i_addr =

					(char *)(ip->i_df.if_u1.if_extents);

				vecp->i_len = ip->i_df.if_bytes;

				XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IEXT);

				vecp->i_type = XLOG_REG_TYPE_IEXT;

			} else

#endif

			{
@@ -355,7 +355,7 @@ xfs_inode_item_format( 
				vecp->i_addr = (xfs_caddr_t)ext_buffer;

				vecp->i_len = xfs_iextents_copy(ip, ext_buffer,

						XFS_DATA_FORK);

				XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IEXT);

				vecp->i_type = XLOG_REG_TYPE_IEXT;

			}

			ASSERT(vecp->i_len <= ip->i_df.if_bytes);

			iip->ili_format.ilf_dsize = vecp->i_len;
@@ -373,7 +373,7 @@ xfs_inode_item_format( 
			ASSERT(ip->i_df.if_broot != NULL);

			vecp->i_addr = (xfs_caddr_t)ip->i_df.if_broot;

			vecp->i_len = ip->i_df.if_broot_bytes;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IBROOT);

			vecp->i_type = XLOG_REG_TYPE_IBROOT;

			vecp++;

			nvecs++;

			iip->ili_format.ilf_dsize = ip->i_df.if_broot_bytes;
@@ -399,7 +399,7 @@ xfs_inode_item_format( 
			ASSERT((ip->i_df.if_real_bytes == 0) ||

			       (ip->i_df.if_real_bytes == data_bytes));

			vecp->i_len = (int)data_bytes;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_ILOCAL);

			vecp->i_type = XLOG_REG_TYPE_ILOCAL;

			vecp++;

			nvecs++;

			iip->ili_format.ilf_dsize = (unsigned)data_bytes;
@@ -477,7 +477,7 @@ xfs_inode_item_format( 
			vecp->i_len = xfs_iextents_copy(ip, ext_buffer,

					XFS_ATTR_FORK);

#endif

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_EXT);

			vecp->i_type = XLOG_REG_TYPE_IATTR_EXT;

			iip->ili_format.ilf_asize = vecp->i_len;

			vecp++;

			nvecs++;
@@ -492,7 +492,7 @@ xfs_inode_item_format( 
			ASSERT(ip->i_afp->if_broot != NULL);

			vecp->i_addr = (xfs_caddr_t)ip->i_afp->if_broot;

			vecp->i_len = ip->i_afp->if_broot_bytes;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_BROOT);

			vecp->i_type = XLOG_REG_TYPE_IATTR_BROOT;

			vecp++;

			nvecs++;

			iip->ili_format.ilf_asize = ip->i_afp->if_broot_bytes;
@@ -516,7 +516,7 @@ xfs_inode_item_format( 
			ASSERT((ip->i_afp->if_real_bytes == 0) ||

			       (ip->i_afp->if_real_bytes == data_bytes));

			vecp->i_len = (int)data_bytes;

			XLOG_VEC_SET_TYPE(vecp, XLOG_REG_TYPE_IATTR_LOCAL);

			vecp->i_type = XLOG_REG_TYPE_IATTR_LOCAL;

			vecp++;

			nvecs++;

			iip->ili_format.ilf_asize = (unsigned)data_bytes;

fs/xfs/xfs_log.c

+2 −2
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
	if (! (XLOG_FORCED_SHUTDOWN(log))) {

		reg[0].i_addr = (void*)&magic;

		reg[0].i_len  = sizeof(magic);

		XLOG_VEC_SET_TYPE(&reg[0], XLOG_REG_TYPE_UNMOUNT);

		reg[0].i_type = XLOG_REG_TYPE_UNMOUNT;



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

					XFS_LOG, 0, XLOG_UNMOUNT_REC_TYPE);
@@ -1236,7 +1236,7 @@ xlog_commit_record(xfs_mount_t *mp, 


	reg[0].i_addr = NULL;

	reg[0].i_len = 0;

	XLOG_VEC_SET_TYPE(&reg[0], XLOG_REG_TYPE_COMMIT);

	reg[0].i_type = XLOG_REG_TYPE_COMMIT;



	ASSERT_ALWAYS(iclog);

	if ((error = xlog_write(mp, reg, 1, ticket, commitlsnp,