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

Commit 4e0d5f92 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: fix the xfs_log_iovec i_addr type 



By making this member a void pointer we can get rid of a lot of pointless
casts.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 898621d5

fs/xfs/quota/xfs_dquot_item.c

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

	struct xfs_dq_logitem	*qlip = DQUOT_ITEM(lip);



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

	logvec->i_addr = &qlip->qli_format;

	logvec->i_len  = sizeof(xfs_dq_logformat_t);

	logvec->i_type = XLOG_REG_TYPE_QFORMAT;

	logvec++;

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

	logvec->i_addr = &qlip->qli_dquot->q_core;

	logvec->i_len  = sizeof(xfs_disk_dquot_t);

	logvec->i_type = XLOG_REG_TYPE_DQUOT;
@@ -369,7 +369,7 @@ xfs_qm_qoff_logitem_format( 


	ASSERT(qflip->qql_format.qf_type == XFS_LI_QUOTAOFF);



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

	log_vector->i_addr = &qflip->qql_format;

	log_vector->i_len = sizeof(xfs_qoff_logitem_t);

	log_vector->i_type = XLOG_REG_TYPE_QUOTAOFF;

	qflip->qql_format.qf_size = 1;

fs/xfs/xfs_buf_item.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ xfs_buf_item_format( 
	base_size =

		(uint)(sizeof(xfs_buf_log_format_t) +

		       ((bip->bli_format.blf_map_size - 1) * sizeof(uint)));

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

	vecp->i_addr = &bip->bli_format;

	vecp->i_len = base_size;

	vecp->i_type = XLOG_REG_TYPE_BFORMAT;

	vecp++;

fs/xfs/xfs_extfree_item.c

+5 −7
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ xfs_efi_item_format( 
	size += (efip->efi_format.efi_nextents - 1) * sizeof(xfs_extent_t);

	efip->efi_format.efi_size = 1;



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

	log_vector->i_addr = &efip->efi_format;

	log_vector->i_len = size;

	log_vector->i_type = XLOG_REG_TYPE_EFI_FORMAT;

	ASSERT(size >= sizeof(xfs_efi_log_format_t));
@@ -244,7 +244,7 @@ xfs_efi_init( 
int

xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt)

{

	xfs_efi_log_format_t *src_efi_fmt = (xfs_efi_log_format_t *)buf->i_addr;

	xfs_efi_log_format_t *src_efi_fmt = buf->i_addr;

	uint i;

	uint len = sizeof(xfs_efi_log_format_t) + 

		(src_efi_fmt->efi_nextents - 1) * sizeof(xfs_extent_t);
@@ -257,8 +257,7 @@ xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt) 
		memcpy((char *)dst_efi_fmt, (char*)src_efi_fmt, len);

		return 0;

	} else if (buf->i_len == len32) {

		xfs_efi_log_format_32_t *src_efi_fmt_32 =

			(xfs_efi_log_format_32_t *)buf->i_addr;

		xfs_efi_log_format_32_t *src_efi_fmt_32 = buf->i_addr;



		dst_efi_fmt->efi_type     = src_efi_fmt_32->efi_type;

		dst_efi_fmt->efi_size     = src_efi_fmt_32->efi_size;
@@ -272,8 +271,7 @@ xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt) 
		}

		return 0;

	} else if (buf->i_len == len64) {

		xfs_efi_log_format_64_t *src_efi_fmt_64 =

			(xfs_efi_log_format_64_t *)buf->i_addr;

		xfs_efi_log_format_64_t *src_efi_fmt_64 = buf->i_addr;



		dst_efi_fmt->efi_type     = src_efi_fmt_64->efi_type;

		dst_efi_fmt->efi_size     = src_efi_fmt_64->efi_size;
@@ -373,7 +371,7 @@ xfs_efd_item_format( 
	size += (efdp->efd_format.efd_nextents - 1) * sizeof(xfs_extent_t);

	efdp->efd_format.efd_size = 1;



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

	log_vector->i_addr = &efdp->efd_format;

	log_vector->i_len = size;

	log_vector->i_type = XLOG_REG_TYPE_EFD_FORMAT;

	ASSERT(size >= sizeof(xfs_efd_log_format_t));

fs/xfs/xfs_inode_item.c

+12 −15
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ xfs_inode_item_format( 
	int			nrecs;

	xfs_mount_t		*mp;



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

	vecp->i_addr = &iip->ili_format;

	vecp->i_len  = sizeof(xfs_inode_log_format_t);

	vecp->i_type = XLOG_REG_TYPE_IFORMAT;

	vecp++;
@@ -268,7 +268,7 @@ xfs_inode_item_format( 
	 */

	xfs_synchronize_times(ip);



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

	vecp->i_addr = &ip->i_d;

	vecp->i_len  = sizeof(struct xfs_icdinode);

	vecp->i_type = XLOG_REG_TYPE_ICORE;

	vecp++;
@@ -324,8 +324,7 @@ xfs_inode_item_format( 
				 * extents, so just point to the

				 * real extents array.

				 */

				vecp->i_addr =

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

				vecp->i_addr = ip->i_df.if_u1.if_extents;

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

				vecp->i_type = XLOG_REG_TYPE_IEXT;

			} else
@@ -343,7 +342,7 @@ xfs_inode_item_format( 
				ext_buffer = kmem_alloc(ip->i_df.if_bytes,

					KM_SLEEP);

				iip->ili_extents_buf = ext_buffer;

				vecp->i_addr = (xfs_caddr_t)ext_buffer;

				vecp->i_addr = ext_buffer;

				vecp->i_len = xfs_iextents_copy(ip, ext_buffer,

						XFS_DATA_FORK);

				vecp->i_type = XLOG_REG_TYPE_IEXT;
@@ -362,7 +361,7 @@ xfs_inode_item_format( 
		if (iip->ili_format.ilf_fields & XFS_ILOG_DBROOT) {

			ASSERT(ip->i_df.if_broot_bytes > 0);

			ASSERT(ip->i_df.if_broot != NULL);

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

			vecp->i_addr = ip->i_df.if_broot;

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

			vecp->i_type = XLOG_REG_TYPE_IBROOT;

			vecp++;
@@ -380,7 +379,7 @@ xfs_inode_item_format( 
			ASSERT(ip->i_df.if_u1.if_data != NULL);

			ASSERT(ip->i_d.di_size > 0);



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

			vecp->i_addr = ip->i_df.if_u1.if_data;

			/*

			 * Round i_bytes up to a word boundary.

			 * The underlying memory is guaranteed to
@@ -454,7 +453,7 @@ xfs_inode_item_format( 
			 * There are not delayed allocation extents

			 * for attributes, so just point at the array.

			 */

			vecp->i_addr = (char *)(ip->i_afp->if_u1.if_extents);

			vecp->i_addr = ip->i_afp->if_u1.if_extents;

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

#else

			ASSERT(iip->ili_aextents_buf == NULL);
@@ -464,7 +463,7 @@ xfs_inode_item_format( 
			ext_buffer = kmem_alloc(ip->i_afp->if_bytes,

				KM_SLEEP);

			iip->ili_aextents_buf = ext_buffer;

			vecp->i_addr = (xfs_caddr_t)ext_buffer;

			vecp->i_addr = ext_buffer;

			vecp->i_len = xfs_iextents_copy(ip, ext_buffer,

					XFS_ATTR_FORK);

#endif
@@ -481,7 +480,7 @@ xfs_inode_item_format( 
		if (iip->ili_format.ilf_fields & XFS_ILOG_ABROOT) {

			ASSERT(ip->i_afp->if_broot_bytes > 0);

			ASSERT(ip->i_afp->if_broot != NULL);

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

			vecp->i_addr = ip->i_afp->if_broot;

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

			vecp->i_type = XLOG_REG_TYPE_IATTR_BROOT;

			vecp++;
@@ -497,7 +496,7 @@ xfs_inode_item_format( 
			ASSERT(ip->i_afp->if_bytes > 0);

			ASSERT(ip->i_afp->if_u1.if_data != NULL);



			vecp->i_addr = (xfs_caddr_t)ip->i_afp->if_u1.if_data;

			vecp->i_addr = ip->i_afp->if_u1.if_data;

			/*

			 * Round i_bytes up to a word boundary.

			 * The underlying memory is guaranteed to
@@ -938,9 +937,8 @@ xfs_inode_item_format_convert( 
	xfs_inode_log_format_t	*in_f)

{

	if (buf->i_len == sizeof(xfs_inode_log_format_32_t)) {

		xfs_inode_log_format_32_t *in_f32;

		xfs_inode_log_format_32_t *in_f32 = buf->i_addr;



		in_f32 = (xfs_inode_log_format_32_t *)buf->i_addr;

		in_f->ilf_type = in_f32->ilf_type;

		in_f->ilf_size = in_f32->ilf_size;

		in_f->ilf_fields = in_f32->ilf_fields;
@@ -956,9 +954,8 @@ xfs_inode_item_format_convert( 
		in_f->ilf_boffset = in_f32->ilf_boffset;

		return 0;

	} else if (buf->i_len == sizeof(xfs_inode_log_format_64_t)){

		xfs_inode_log_format_64_t *in_f64;

		xfs_inode_log_format_64_t *in_f64 = buf->i_addr;



		in_f64 = (xfs_inode_log_format_64_t *)buf->i_addr;

		in_f->ilf_type = in_f64->ilf_type;

		in_f->ilf_size = in_f64->ilf_size;

		in_f->ilf_fields = in_f64->ilf_fields;

fs/xfs/xfs_log.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) 
				.magic = XLOG_UNMOUNT_TYPE,

			};

			struct xfs_log_iovec reg = {

				.i_addr = (void *)&magic,

				.i_addr = &magic,

				.i_len = sizeof(magic),

				.i_type = XLOG_REG_TYPE_UNMOUNT,

			};