Commit 64c314ff authored by Eric Biggers's avatar Eric Biggers Committed by Theodore Ts'o
Browse files

ext4: remove unnecessary ifdefs in htree_dirblock_to_tree() 



The ifdefs for CONFIG_FS_ENCRYPTION in htree_dirblock_to_tree() are
unnecessary, as the called functions are already stubbed out when
!CONFIG_FS_ENCRYPTION.  Remove them.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191209213225.18477-1-ebiggers@kernel.org


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 7063743f

fs/ext4/namei.c

+1 −4
Original line number Diff line number Diff line
@@ -1009,7 +1009,6 @@ static int htree_dirblock_to_tree(struct file *dir_file, 
	top = (struct ext4_dir_entry_2 *) ((char *) de +

					   dir->i_sb->s_blocksize -

					   EXT4_DIR_REC_LEN(0));

#ifdef CONFIG_FS_ENCRYPTION

	/* Check if the directory is encrypted */

	if (IS_ENCRYPTED(dir)) {

		err = fscrypt_get_encryption_info(dir);
@@ -1024,7 +1023,7 @@ static int htree_dirblock_to_tree(struct file *dir_file, 
			return err;

		}

	}

#endif



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

		if (ext4_check_dir_entry(dir, NULL, de, bh,

				bh->b_data, bh->b_size,
@@ -1072,9 +1071,7 @@ static int htree_dirblock_to_tree(struct file *dir_file, 
	}

errout:

	brelse(bh);

#ifdef CONFIG_FS_ENCRYPTION

	fscrypt_fname_free_buffer(&fname_crypto_str);

#endif

	return count;

}