xfs remove the XFS_TRANS_DEBUG routines (ec47eb6b) · Commits · e / devices / android_kernel_oneplus_sm7250

fs/xfs/xfs_buf_item.c

+0 −106

Original line number	Diff line number	Diff line
		@@ -37,109 +37,6 @@ static inline struct xfs_buf_log_item BUF_ITEM(struct xfs_log_item lip)
		return container_of(lip, struct xfs_buf_log_item, bli_item);
		}


		#ifdef XFS_TRANS_DEBUG
		/*
		* This function uses an alternate strategy for tracking the bytes
		* that the user requests to be logged. This can then be used
		* in conjunction with the bli_orig array in the buf log item to
		* catch bugs in our callers' code.
		*
		* We also double check the bits set in xfs_buf_item_log using a
		* simple algorithm to check that every byte is accounted for.
		*/
		STATIC void
		xfs_buf_item_log_debug(
		xfs_buf_log_item_t *bip,
		uint first,
		uint last)
		{
		uint x;
		uint byte;
		uint nbytes;
		uint chunk_num;
		uint word_num;
		uint bit_num;
		uint bit_set;
		uint *wordp;

		ASSERT(bip->bli_logged != NULL);
		byte = first;
		nbytes = last - first + 1;
		bfset(bip->bli_logged, first, nbytes);
		for (x = 0; x < nbytes; x++) {
		chunk_num = byte >> XFS_BLF_SHIFT;
		word_num = chunk_num >> BIT_TO_WORD_SHIFT;
		bit_num = chunk_num & (NBWORD - 1);
		wordp = &(bip->__bli_format.blf_data_map[word_num]);
		bit_set = *wordp & (1 << bit_num);
		ASSERT(bit_set);
		byte++;
		}
		}

		/*
		* This function is called when we flush something into a buffer without
		* logging it. This happens for things like inodes which are logged
		* separately from the buffer.
		*/
		void
		xfs_buf_item_flush_log_debug(
		xfs_buf_t *bp,
		uint first,
		uint last)
		{
		xfs_buf_log_item_t *bip = bp->b_fspriv;
		uint nbytes;

		if (bip == NULL \|\| (bip->bli_item.li_type != XFS_LI_BUF))
		return;

		ASSERT(bip->bli_logged != NULL);
		nbytes = last - first + 1;
		bfset(bip->bli_logged, first, nbytes);
		}

		/*
		* This function is called to verify that our callers have logged
		* all the bytes that they changed.
		*
		* It does this by comparing the original copy of the buffer stored in
		* the buf log item's bli_orig array to the current copy of the buffer
		* and ensuring that all bytes which mismatch are set in the bli_logged
		* array of the buf log item.
		*/
		STATIC void
		xfs_buf_item_log_check(
		xfs_buf_log_item_t *bip)
		{
		char *orig;
		char *buffer;
		int x;
		xfs_buf_t *bp;

		ASSERT(bip->bli_orig != NULL);
		ASSERT(bip->bli_logged != NULL);

		bp = bip->bli_buf;
		ASSERT(bp->b_length > 0);
		ASSERT(bp->b_addr != NULL);
		orig = bip->bli_orig;
		buffer = bp->b_addr;
		for (x = 0; x < BBTOB(bp->b_length); x++) {
		if (orig[x] != buffer[x] && !btst(bip->bli_logged, x)) {
		xfs_emerg(bp->b_mount,
		"%s: bip %x buffer %x orig %x index %d",
		__func__, bip, bp, orig, x);
		ASSERT(0);
		}
		}
		}
		#else
		#define xfs_buf_item_log_debug(x,y,z)
		#define xfs_buf_item_log_check(x)
		#endif

		STATIC void xfs_buf_do_callbacks(struct xfs_buf *bp);

		/*
		@@ -429,7 +326,6 @@ xfs_buf_item_format(
		* Check to make sure everything is consistent.
		*/
		trace_xfs_buf_item_format(bip);
		xfs_buf_item_log_check(bip);
		}

		/*
		@@ -915,8 +811,6 @@ xfs_buf_item_log_segment(
		mask = (1 << end_bit) - 1;
		*wordp \|= mask;
		}

		xfs_buf_item_log_debug(bip, first, last);
		}

		/*

fs/xfs/xfs_buf_item.h

+0 −14

Original line number	Diff line number	Diff line
		@@ -98,10 +98,6 @@ typedef struct xfs_buf_log_item {
		unsigned int bli_flags; /* misc flags */
		unsigned int bli_recur; /* lock recursion count */
		atomic_t bli_refcount; /* cnt of tp refs */
		#ifdef XFS_TRANS_DEBUG
		char bli_orig; / original buffer copy */
		char bli_logged; / bytes logged (bitmap) */
		#endif
		int bli_format_count; /* count of headers */
		struct xfs_buf_log_format bli_formats; / array of in-log header ptrs */
		struct xfs_buf_log_format __bli_format; /* embedded in-log header */
		@@ -117,16 +113,6 @@ void xfs_buf_attach_iodone(struct xfs_buf *,
		void xfs_buf_iodone_callbacks(struct xfs_buf *);
		void xfs_buf_iodone(struct xfs_buf , struct xfs_log_item );

		#ifdef XFS_TRANS_DEBUG
		void
		xfs_buf_item_flush_log_debug(
		struct xfs_buf *bp,
		uint first,
		uint last);
		#else
		#define xfs_buf_item_flush_log_debug(bp, first, last)
		#endif

		#endif /* __KERNEL__ */

		#endif /* __XFS_BUF_ITEM_H__ */

fs/xfs/xfs_inode.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2379,9 +2379,6 @@ xfs_iflush_fork(
		char *cp;
		xfs_ifork_t *ifp;
		xfs_mount_t *mp;
		#ifdef XFS_TRANS_DEBUG
		int first;
		#endif
		static const short brootflag[2] =
		{ XFS_ILOG_DBROOT, XFS_ILOG_ABROOT };
		static const short dataflag[2] =
		@@ -2724,9 +2721,6 @@ xfs_iflush_int(
		xfs_inode_log_item_t *iip;
		xfs_dinode_t *dip;
		xfs_mount_t *mp;
		#ifdef XFS_TRANS_DEBUG
		int first;
		#endif

		ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL\|XFS_ILOCK_SHARED));
		ASSERT(xfs_isiflocked(ip));

fs/xfs/xfs_inode_item.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -269,17 +269,6 @@ xfs_inode_item_format(
		} else {
		ASSERT(!(iip->ili_fields &
		XFS_ILOG_DBROOT));
		#ifdef XFS_TRANS_DEBUG
		if (iip->ili_root_size > 0) {
		ASSERT(iip->ili_root_size ==
		ip->i_df.if_broot_bytes);
		ASSERT(memcmp(iip->ili_orig_root,
		ip->i_df.if_broot,
		iip->ili_root_size) == 0);
		} else {
		ASSERT(ip->i_df.if_broot_bytes == 0);
		}
		#endif
		iip->ili_fields &= ~XFS_ILOG_DBROOT;
		}
		break;
		@@ -678,11 +667,6 @@ void
		xfs_inode_item_destroy(
		xfs_inode_t *ip)
		{
		#ifdef XFS_TRANS_DEBUG
		if (ip->i_itemp->ili_root_size != 0) {
		kmem_free(ip->i_itemp->ili_orig_root);
		}
		#endif
		kmem_zone_free(xfs_ili_zone, ip->i_itemp);
		}

fs/xfs/xfs_inode_item.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -148,10 +148,6 @@ typedef struct xfs_inode_log_item {
		data exts */
		struct xfs_bmbt_rec ili_aextents_buf; / array of logged
		attr exts */
		#ifdef XFS_TRANS_DEBUG
		int ili_root_size;
		char *ili_orig_root;
		#endif
		xfs_inode_log_format_t ili_format; /* logged structure */
		} xfs_inode_log_item_t;