Commit 837c23fb authored by Chunguang Xu's avatar Chunguang Xu Committed by Theodore Ts'o
Browse files

ext4: use ASSERT() to replace J_ASSERT() 



There are currently multiple forms of assertion, such as J_ASSERT().
J_ASEERT() is provided for the jbd module, which is a public module.
Maybe we should use custom ASSERT() like other file systems, such as
xfs, which would be better.

Signed-off-by: default avatarChunguang Xu <brookxu@tencent.com>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/1604764698-4269-1-git-send-email-brookxu@tencent.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent ca9b404f

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int ext4_init_block_bitmap(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_fsblk_t start, tmp;



	J_ASSERT_BH(bh, buffer_locked(bh));

	ASSERT(buffer_locked(bh));



	/* If checksum is bad mark all blocks used to prevent allocation

	 * essentially implementing a per-group read-only flag. */

fs/ext4/ext4.h

+10 −0
Original line number Diff line number Diff line
@@ -98,6 +98,16 @@ 
#define ext_debug(ino, fmt, ...)	no_printk(fmt, ##__VA_ARGS__)

#endif



#define ASSERT(assert)						\

do {									\

	if (unlikely(!(assert))) {					\

		printk(KERN_EMERG					\

		       "Assertion failure in %s() at %s:%d: '%s'\n",	\

		       __func__, __FILE__, __LINE__, #assert);		\

		BUG();							\

	}								\

} while (0)



/* data type for block offset of block group */

typedef int ext4_grpblk_t;

fs/ext4/fsync.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
	if (unlikely(ext4_forced_shutdown(sbi)))

		return -EIO;



	J_ASSERT(ext4_journal_current_handle() == NULL);

	ASSERT(ext4_journal_current_handle() == NULL);



	trace_ext4_sync_file_enter(file, datasync);

fs/ext4/indirect.c

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode, 
	ext4_fsblk_t first_block = 0;



	trace_ext4_ind_map_blocks_enter(inode, map->m_lblk, map->m_len, flags);

	J_ASSERT(!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)));

	J_ASSERT(handle != NULL || (flags & EXT4_GET_BLOCKS_CREATE) == 0);

	ASSERT(!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)));

	ASSERT(handle != NULL || (flags & EXT4_GET_BLOCKS_CREATE) == 0);

	depth = ext4_block_to_path(inode, map->m_lblk, offsets,

				   &blocks_to_boundary);

fs/ext4/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode, 
	int create = map_flags & EXT4_GET_BLOCKS_CREATE;

	int err;



	J_ASSERT((EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

	ASSERT((EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

		    || handle != NULL || create == 0);



	map.m_lblk = block;
@@ -846,8 +846,8 @@ struct buffer_head *ext4_getblk(handle_t *handle, struct inode *inode, 
	if (unlikely(!bh))

		return ERR_PTR(-ENOMEM);

	if (map.m_flags & EXT4_MAP_NEW) {

		J_ASSERT(create != 0);

		J_ASSERT((EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

		ASSERT(create != 0);

		ASSERT((EXT4_SB(inode->i_sb)->s_mount_state & EXT4_FC_REPLAY)

			    || (handle != NULL));



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE