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

Commit 60fd4da3 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: Cleanup ext4_check_dir_entry so __func__ is now implicit 


    
Also start passing the line number to ext4_check_dir since we're going
to need it in upcoming patch.
    
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 90c7201b

fs/ext4/dir.c

+6 −5
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static unsigned char get_dtype(struct super_block *sb, int filetype) 
}





int ext4_check_dir_entry(const char *function, struct inode *dir,

int __ext4_check_dir_entry(const char *function, unsigned int line,

			   struct inode *dir,

			   struct ext4_dir_entry_2 *de,

			   struct buffer_head *bh,

			   unsigned int offset)
@@ -194,7 +195,7 @@ revalidate: 
		while (!error && filp->f_pos < inode->i_size

		       && offset < sb->s_blocksize) {

			de = (struct ext4_dir_entry_2 *) (bh->b_data + offset);

			if (!ext4_check_dir_entry("ext4_readdir", inode, de,

			if (!ext4_check_dir_entry(inode, de,

						  bh, offset)) {

				/*

				 * On error, skip the f_pos to the next block

fs/ext4/ext4.h

+5 −3
Original line number Diff line number Diff line
@@ -1515,9 +1515,11 @@ extern unsigned ext4_init_block_bitmap(struct super_block *sb, 
		ext4_init_block_bitmap(sb, NULL, group, desc)



/* dir.c */

extern int ext4_check_dir_entry(const char *, struct inode *,

extern int __ext4_check_dir_entry(const char *, unsigned int, struct inode *,

				  struct ext4_dir_entry_2 *,

				  struct buffer_head *, unsigned int);

#define ext4_check_dir_entry(dir, de, bh, offset) \

	__ext4_check_dir_entry(__func__, __LINE__, (dir), (de), (bh), (offset))

extern int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,

				    __u32 minor_hash,

				    struct ext4_dir_entry_2 *dirent);

fs/ext4/namei.c

+6 −8
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static int htree_dirblock_to_tree(struct file *dir_file, 
					   dir->i_sb->s_blocksize -

					   EXT4_DIR_REC_LEN(0));

	for (; de < top; de = ext4_next_entry(de, dir->i_sb->s_blocksize)) {

		if (!ext4_check_dir_entry("htree_dirblock_to_tree", dir, de, bh,

		if (!ext4_check_dir_entry(dir, de, bh,

					(block<<EXT4_BLOCK_SIZE_BITS(dir->i_sb))

						+((char *)de - bh->b_data))) {

			/* On error, skip the f_pos to the next block. */
@@ -844,8 +844,7 @@ static inline int search_dirblock(struct buffer_head *bh, 
		if ((char *) de + namelen <= dlimit &&

		    ext4_match (namelen, name, de)) {

			/* found a match - just to be sure, do a full check */

			if (!ext4_check_dir_entry("ext4_find_entry",

						  dir, de, bh, offset))

			if (!ext4_check_dir_entry(dir, de, bh, offset))

				return -1;

			*res_dir = de;

			return 1;
@@ -1019,7 +1018,7 @@ static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct q 
			int off = (block << EXT4_BLOCK_SIZE_BITS(sb))

				  + ((char *) de - bh->b_data);



			if (!ext4_check_dir_entry(__func__, dir, de, bh, off)) {

			if (!ext4_check_dir_entry(dir, de, bh, off)) {

				brelse(bh);

				*err = ERR_BAD_DX_DIR;

				goto errout;
@@ -1303,8 +1302,7 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry, 
		de = (struct ext4_dir_entry_2 *)bh->b_data;

		top = bh->b_data + blocksize - reclen;

		while ((char *) de <= top) {

			if (!ext4_check_dir_entry("ext4_add_entry", dir, de,

						  bh, offset))

			if (!ext4_check_dir_entry(dir, de, bh, offset))

				return -EIO;

			if (ext4_match(namelen, name, de))

				return -EEXIST;
@@ -1671,7 +1669,7 @@ static int ext4_delete_entry(handle_t *handle, 
	pde = NULL;

	de = (struct ext4_dir_entry_2 *) bh->b_data;

	while (i < bh->b_size) {

		if (!ext4_check_dir_entry("ext4_delete_entry", dir, de, bh, i))

		if (!ext4_check_dir_entry(dir, de, bh, i))

			return -EIO;

		if (de == de_del)  {

			BUFFER_TRACE(bh, "get_write_access");
@@ -1954,7 +1952,7 @@ static int empty_dir(struct inode *inode) 
			}

			de = (struct ext4_dir_entry_2 *) bh->b_data;

		}

		if (!ext4_check_dir_entry("empty_dir", inode, de, bh, offset)) {

		if (!ext4_check_dir_entry(inode, de, bh, offset)) {

			de = (struct ext4_dir_entry_2 *)(bh->b_data +

							 sb->s_blocksize);

			offset = (offset | (sb->s_blocksize - 1)) + 1;