Commit 5298d4bf authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Gabriel Krisman Bertazi
Browse files

unicode: clean up the Kconfig symbol confusion 



Turn the CONFIG_UNICODE symbol into a tristate that generates some always
built in code and remove the confusing CONFIG_UNICODE_UTF8_DATA symbol.

Note that a lot of the IS_ENABLED() checks could be turned from cpp
statements into normal ifs, but this change is intended to be fairly
mechanic, so that should be cleaned up later.

Fixes: 2b3d0478 ("unicode: Add utf8-data module")
Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
parent 6661224e

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ obj-$(CONFIG_EXPORTFS) += exportfs/ 
obj-$(CONFIG_NFSD)		+= nfsd/

obj-$(CONFIG_LOCKD)		+= lockd/

obj-$(CONFIG_NLS)		+= nls/

obj-$(CONFIG_UNICODE)		+= unicode/

obj-y				+= unicode/

obj-$(CONFIG_SYSV_FS)		+= sysv/

obj-$(CONFIG_SMBFS_COMMON)	+= smbfs_common/

obj-$(CONFIG_CIFS)		+= cifs/

fs/ext4/ext4.h

+7 −7
Original line number Diff line number Diff line
@@ -2485,7 +2485,7 @@ struct ext4_filename { 
#ifdef CONFIG_FS_ENCRYPTION

	struct fscrypt_str crypto_buf;

#endif

#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	struct fscrypt_str cf_name;

#endif

};
@@ -2721,7 +2721,7 @@ extern unsigned ext4_free_clusters_after_init(struct super_block *sb, 
					      struct ext4_group_desc *gdp);

ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

extern int ext4_fname_setup_ci_filename(struct inode *dir,

					 const struct qstr *iname,

					 struct ext4_filename *fname);
@@ -2754,7 +2754,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, 


	ext4_fname_from_fscrypt_name(fname, &name);



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	err = ext4_fname_setup_ci_filename(dir, iname, fname);

#endif

	return err;
@@ -2773,7 +2773,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, 


	ext4_fname_from_fscrypt_name(fname, &name);



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);

#endif

	return err;
@@ -2790,7 +2790,7 @@ static inline void ext4_fname_free_filename(struct ext4_filename *fname) 
	fname->usr_fname = NULL;

	fname->disk_name.name = NULL;



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	kfree(fname->cf_name.name);

	fname->cf_name.name = NULL;

#endif
@@ -2806,7 +2806,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, 
	fname->disk_name.name = (unsigned char *) iname->name;

	fname->disk_name.len = iname->len;



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	err = ext4_fname_setup_ci_filename(dir, iname, fname);

#endif
@@ -2822,7 +2822,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, 


static inline void ext4_fname_free_filename(struct ext4_filename *fname)

{

#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	kfree(fname->cf_name.name);

	fname->cf_name.name = NULL;

#endif

fs/ext4/hash.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int __ext4fs_dirhash(const struct inode *dir, const char *name, int len, 
int ext4fs_dirhash(const struct inode *dir, const char *name, int len,

		   struct dx_hash_info *hinfo)

{

#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	const struct unicode_map *um = dir->i_sb->s_encoding;

	int r, dlen;

	unsigned char *buff;

fs/ext4/namei.c

+6 −6
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) 
	dx_set_count(entries, count + 1);

}



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

/*

 * Test whether a case-insensitive directory entry matches the filename

 * being searched for.  If quick is set, assume the name being looked up
@@ -1428,7 +1428,7 @@ static bool ext4_match(struct inode *parent, 
	f.crypto_buf = fname->crypto_buf;

#endif



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&

	    (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {

		if (fname->cf_name.name) {
@@ -1800,7 +1800,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi 
		}

	}



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	if (!inode && IS_CASEFOLDED(dir)) {

		/* Eventually we want to call d_add_ci(dentry, NULL)

		 * for negative dentries in the encoding case as
@@ -2308,7 +2308,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, 
	if (fscrypt_is_nokey_name(dentry))

		return -ENOKEY;



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) &&

	    sb->s_encoding && utf8_validate(sb->s_encoding, &dentry->d_name))

		return -EINVAL;
@@ -3126,7 +3126,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) 
	ext4_fc_track_unlink(handle, dentry);

	retval = ext4_mark_inode_dirty(handle, dir);



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	/* VFS negative dentries are incompatible with Encoding and

	 * Case-insensitiveness. Eventually we'll want avoid

	 * invalidating the dentries here, alongside with returning the
@@ -3231,7 +3231,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) 
	retval = __ext4_unlink(handle, dir, &dentry->d_name, d_inode(dentry));

	if (!retval)

		ext4_fc_track_unlink(handle, dentry);

#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	/* VFS negative dentries are incompatible with Encoding and

	 * Case-insensitiveness. Eventually we'll want avoid

	 * invalidating the dentries here, alongside with returning the

fs/ext4/super.c

+5 −5
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ static void ext4_put_super(struct super_block *sb) 
	kfree(sbi->s_blockgroup_lock);

	fs_put_dax(sbi->s_daxdev);

	fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);

#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	utf8_unload(sb->s_encoding);

#endif

	kfree(sbi);
@@ -1962,7 +1962,7 @@ static const struct mount_opts { 
	{Opt_err, 0, 0}

};



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

static const struct ext4_sb_encodings {

	__u16 magic;

	char *name;
@@ -3609,7 +3609,7 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) 
		return 0;

	}



#ifndef CONFIG_UNICODE

#if !IS_ENABLED(CONFIG_UNICODE)

	if (ext4_has_feature_casefold(sb)) {

		ext4_msg(sb, KERN_ERR,

			 "Filesystem with casefold feature cannot be "
@@ -4613,7 +4613,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 
	if (err < 0)

		goto failed_mount;



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {

		const struct ext4_sb_encodings *encoding_info;

		struct unicode_map *encoding;
@@ -5517,7 +5517,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) 
	if (sbi->s_chksum_driver)

		crypto_free_shash(sbi->s_chksum_driver);



#ifdef CONFIG_UNICODE

#if IS_ENABLED(CONFIG_UNICODE)

	utf8_unload(sb->s_encoding);

#endif