Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext4: Move CONFIG_UNICODE defguards into the code flow

Browse Source 
Instead of a bunch of ifdefs, make the unicode built checks part of the
code flow where possible, as requested by Torvalds.

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
[eugen.hristev@collabora.com: port to 6.10-rc1]
Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
Link: https://lore.kernel.org/r/20240606073353.47130-7-eugen.hristev@collabora.com
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@suse.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Gabriel Krisman Bertazi 2024-06-06 10:33:52 +03:00 committed by Christian Brauner
parent d66858eb0c
commit d98c822232
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
4 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ext4/crypto.c
View File

@ -31,11 +31,10 @@ int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname,
ext4_fname_from_fscrypt_name(fname, &name); ext4_fname_from_fscrypt_name(fname, &name);
#if IS_ENABLED(CONFIG_UNICODE)
err = ext4_fname_setup_ci_filename(dir, iname, fname); err = ext4_fname_setup_ci_filename(dir, iname, fname);
if (err) if (err)
ext4_fname_free_filename(fname); ext4_fname_free_filename(fname);
#endif
return err; return err;
} }
@ -51,11 +50,9 @@ int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry,
ext4_fname_from_fscrypt_name(fname, &name); ext4_fname_from_fscrypt_name(fname, &name);
#if IS_ENABLED(CONFIG_UNICODE)
err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname); err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);
if (err) if (err)
ext4_fname_free_filename(fname); ext4_fname_free_filename(fname);
#endif
return err; return err;
} }
@ -70,10 +67,7 @@ void ext4_fname_free_filename(struct ext4_filename *fname)
fname->usr_fname = NULL; fname->usr_fname = NULL;
fname->disk_name.name = NULL; fname->disk_name.name = NULL;
#if IS_ENABLED(CONFIG_UNICODE) ext4_fname_free_ci_filename(fname);
kfree(fname->cf_name.name);
fname->cf_name.name = NULL;
#endif
} }
static bool uuid_is_zero(__u8 u[16]) static bool uuid_is_zero(__u8 u[16])

33
fs/ext4/ext4.h
View File

@ -2745,8 +2745,25 @@ ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
#if IS_ENABLED(CONFIG_UNICODE) #if IS_ENABLED(CONFIG_UNICODE)
extern int ext4_fname_setup_ci_filename(struct inode *dir, extern int ext4_fname_setup_ci_filename(struct inode *dir,
const struct qstr *iname, const struct qstr *iname,
struct ext4_filename *fname); struct ext4_filename *fname);
static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname)
{
kfree(fname->cf_name.name);
fname->cf_name.name = NULL;
}
#else
static inline int ext4_fname_setup_ci_filename(struct inode *dir,
const struct qstr *iname,
struct ext4_filename *fname)
{
return 0;
}
static inline void ext4_fname_free_ci_filename(struct ext4_filename *fname)
{
}
#endif #endif
/* ext4 encryption related stuff goes here crypto.c */ /* ext4 encryption related stuff goes here crypto.c */
@ -2769,16 +2786,11 @@ static inline int ext4_fname_setup_filename(struct inode *dir,
int lookup, int lookup,
struct ext4_filename *fname) struct ext4_filename *fname)
{ {
int err = 0;
fname->usr_fname = iname; fname->usr_fname = iname;
fname->disk_name.name = (unsigned char *) iname->name; fname->disk_name.name = (unsigned char *) iname->name;
fname->disk_name.len = iname->len; fname->disk_name.len = iname->len;
#if IS_ENABLED(CONFIG_UNICODE) return ext4_fname_setup_ci_filename(dir, iname, fname);
err = ext4_fname_setup_ci_filename(dir, iname, fname);
#endif
return err;
} }
static inline int ext4_fname_prepare_lookup(struct inode *dir, static inline int ext4_fname_prepare_lookup(struct inode *dir,
@ -2790,10 +2802,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir,
static inline void ext4_fname_free_filename(struct ext4_filename *fname) static inline void ext4_fname_free_filename(struct ext4_filename *fname)
{ {
#if IS_ENABLED(CONFIG_UNICODE) ext4_fname_free_ci_filename(fname);
kfree(fname->cf_name.name);
fname->cf_name.name = NULL;
#endif
} }
static inline int ext4_ioctl_get_encryption_pwsalt(struct file *filp, static inline int ext4_ioctl_get_encryption_pwsalt(struct file *filp,

14
fs/ext4/namei.c
View File

@ -1825,8 +1825,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
} }
} }
#if IS_ENABLED(CONFIG_UNICODE) if (IS_ENABLED(CONFIG_UNICODE) && !inode && IS_CASEFOLDED(dir)) {
if (!inode && IS_CASEFOLDED(dir)) {
/* Eventually we want to call d_add_ci(dentry, NULL) /* Eventually we want to call d_add_ci(dentry, NULL)
* for negative dentries in the encoding case as * for negative dentries in the encoding case as
* well. For now, prevent the negative dentry * well. For now, prevent the negative dentry
@ -1834,7 +1833,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
*/ */
return NULL; return NULL;
} }
#endif
return d_splice_alias(inode, dentry); return d_splice_alias(inode, dentry);
} }
@ -3164,16 +3163,14 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
ext4_fc_track_unlink(handle, dentry); ext4_fc_track_unlink(handle, dentry);
retval = ext4_mark_inode_dirty(handle, dir); retval = ext4_mark_inode_dirty(handle, dir);
#if IS_ENABLED(CONFIG_UNICODE)
/* VFS negative dentries are incompatible with Encoding and /* VFS negative dentries are incompatible with Encoding and
* Case-insensitiveness. Eventually we'll want avoid * Case-insensitiveness. Eventually we'll want avoid
* invalidating the dentries here, alongside with returning the * invalidating the dentries here, alongside with returning the
* negative dentries at ext4_lookup(), when it is better * negative dentries at ext4_lookup(), when it is better
* supported by the VFS for the CI case. * supported by the VFS for the CI case.
*/ */
if (IS_CASEFOLDED(dir)) if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir))
d_invalidate(dentry); d_invalidate(dentry);
#endif
end_rmdir: end_rmdir:
brelse(bh); brelse(bh);
@ -3275,16 +3272,15 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
goto out_trace; goto out_trace;
retval = __ext4_unlink(dir, &dentry->d_name, d_inode(dentry), dentry); retval = __ext4_unlink(dir, &dentry->d_name, d_inode(dentry), dentry);
#if IS_ENABLED(CONFIG_UNICODE)
/* VFS negative dentries are incompatible with Encoding and /* VFS negative dentries are incompatible with Encoding and
* Case-insensitiveness. Eventually we'll want avoid * Case-insensitiveness. Eventually we'll want avoid
* invalidating the dentries here, alongside with returning the * invalidating the dentries here, alongside with returning the
* negative dentries at ext4_lookup(), when it is better * negative dentries at ext4_lookup(), when it is better
* supported by the VFS for the CI case. * supported by the VFS for the CI case.
*/ */
if (IS_CASEFOLDED(dir)) if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir))
d_invalidate(dentry); d_invalidate(dentry);
#endif
out_trace: out_trace:
trace_ext4_unlink_exit(dentry, retval); trace_ext4_unlink_exit(dentry, retval);

4
fs/ext4/super.c
View File

@ -3586,14 +3586,12 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly)
return 0; return 0;
} }
#if !IS_ENABLED(CONFIG_UNICODE) if (!IS_ENABLED(CONFIG_UNICODE) && ext4_has_feature_casefold(sb)) {
if (ext4_has_feature_casefold(sb)) {
ext4_msg(sb, KERN_ERR, ext4_msg(sb, KERN_ERR,
"Filesystem with casefold feature cannot be " "Filesystem with casefold feature cannot be "
"mounted without CONFIG_UNICODE"); "mounted without CONFIG_UNICODE");
return 0; return 0;
} }
#endif
if (readonly) if (readonly)
return 1; return 1;