From: Jan Kara <jack@suse.cz>
To: Eric Biggers <ebiggers@kernel.org>
Cc: linux-ext4@vger.kernel.org, linux-fscrypt@vger.kernel.org
Subject: Re: [PATCH] ext4: remove unnecessary ifdefs in htree_dirblock_to_tree()
Date: Fri, 13 Dec 2019 11:46:25 +0100 [thread overview]
Message-ID: <20191213104625.GC15474@quack2.suse.cz> (raw)
In-Reply-To: <20191209213225.18477-1-ebiggers@kernel.org>
On Mon 09-12-19 13:32:25, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
>
> 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>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/namei.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index a856997d87b54..d4c2cc73fe71d 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -1002,7 +1002,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);
> @@ -1017,7 +1016,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,
> @@ -1065,9 +1064,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;
> }
>
> --
> 2.24.0.393.g34dc348eaf-goog
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2019-12-13 10:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 21:32 [PATCH] ext4: remove unnecessary ifdefs in htree_dirblock_to_tree() Eric Biggers
2019-12-13 10:46 ` Jan Kara [this message]
2020-01-13 18:52 ` Theodore Y. Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213104625.GC15474@quack2.suse.cz \
--to=jack@suse.cz \
--cc=ebiggers@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.