diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-12-09 13:32:25 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-01-17 16:24:52 -0500 |
| commit | 64c314ff822786b4634bb5cfe91ed5a34ba8743e (patch) | |
| tree | dbc8f1a8206b63faad42d4968da9d2bd5c0abbc8 /fs/ext4/namei.c | |
| parent | 7063743f6860874fedc943fb168e079abdc62f2c (diff) | |
| download | linux-stable-64c314ff822786b4634bb5cfe91ed5a34ba8743e.tar.gz linux-stable-64c314ff822786b4634bb5cfe91ed5a34ba8743e.tar.bz2 linux-stable-64c314ff822786b4634bb5cfe91ed5a34ba8743e.zip | |
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: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20191209213225.18477-1-ebiggers@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext4/namei.c')
| -rw-r--r-- | fs/ext4/namei.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index d4c0d7a18d64..129d2ebae00d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -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; } |