On 07/08, Daniel Rosenberg wrote: > This switches f2fs over to the generic support provided in > the previous patch. > > Since casefolded dentries behave the same in ext4 and f2fs, we decrease > the maintenance burden by unifying them, and any optimizations will > immediately apply to both. > > Signed-off-by: Daniel Rosenberg <[email protected]> > Reviewed-by: Eric Biggers <[email protected]>
Acked-by: Jaegeuk Kim <[email protected]> > --- > fs/f2fs/dir.c | 84 +++++------------------------------------ > fs/f2fs/f2fs.h | 4 -- > fs/f2fs/super.c | 10 ++--- > fs/f2fs/sysfs.c | 10 +++-- > include/linux/f2fs_fs.h | 3 -- > 5 files changed, 20 insertions(+), 91 deletions(-) > > diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c > index d35976785e8c..ff61f3a9c11d 100644 > --- a/fs/f2fs/dir.c > +++ b/fs/f2fs/dir.c > @@ -75,21 +75,22 @@ int f2fs_init_casefolded_name(const struct inode *dir, > struct f2fs_filename *fname) > { > #ifdef CONFIG_UNICODE > - struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb); > + struct super_block *sb = dir->i_sb; > + struct f2fs_sb_info *sbi = F2FS_SB(sb); > > if (IS_CASEFOLDED(dir)) { > fname->cf_name.name = f2fs_kmalloc(sbi, F2FS_NAME_LEN, > GFP_NOFS); > if (!fname->cf_name.name) > return -ENOMEM; > - fname->cf_name.len = utf8_casefold(sbi->s_encoding, > + fname->cf_name.len = utf8_casefold(sb->s_encoding, > fname->usr_fname, > fname->cf_name.name, > F2FS_NAME_LEN); > if ((int)fname->cf_name.len <= 0) { > kfree(fname->cf_name.name); > fname->cf_name.name = NULL; > - if (f2fs_has_strict_mode(sbi)) > + if (sb_has_strict_encoding(sb)) > return -EINVAL; > /* fall back to treating name as opaque byte sequence */ > } > @@ -215,8 +216,8 @@ static struct f2fs_dir_entry *find_in_block(struct inode > *dir, > static bool f2fs_match_ci_name(const struct inode *dir, const struct qstr > *name, > const u8 *de_name, u32 de_name_len) > { > - const struct f2fs_sb_info *sbi = F2FS_SB(dir->i_sb); > - const struct unicode_map *um = sbi->s_encoding; > + const struct super_block *sb = dir->i_sb; > + const struct unicode_map *um = sb->s_encoding; > struct qstr entry = QSTR_INIT(de_name, de_name_len); > int res; > > @@ -226,7 +227,7 @@ static bool f2fs_match_ci_name(const struct inode *dir, > const struct qstr *name, > * In strict mode, ignore invalid names. In non-strict mode, > * fall back to treating them as opaque byte sequences. > */ > - if (f2fs_has_strict_mode(sbi) || name->len != entry.len) > + if (sb_has_strict_encoding(sb) || name->len != entry.len) > return false; > return !memcmp(name->name, entry.name, name->len); > } > @@ -1107,75 +1108,8 @@ const struct file_operations f2fs_dir_operations = { > }; > > #ifdef CONFIG_UNICODE > -static int f2fs_d_compare(const struct dentry *dentry, unsigned int len, > - const char *str, const struct qstr *name) > -{ > - const struct dentry *parent = READ_ONCE(dentry->d_parent); > - const struct inode *dir = READ_ONCE(parent->d_inode); > - const struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb); > - struct qstr entry = QSTR_INIT(str, len); > - char strbuf[DNAME_INLINE_LEN]; > - int res; > - > - if (!dir || !IS_CASEFOLDED(dir)) > - goto fallback; > - > - /* > - * If the dentry name is stored in-line, then it may be concurrently > - * modified by a rename. If this happens, the VFS will eventually retry > - * the lookup, so it doesn't matter what ->d_compare() returns. > - * However, it's unsafe to call utf8_strncasecmp() with an unstable > - * string. Therefore, we have to copy the name into a temporary buffer. > - */ > - if (len <= DNAME_INLINE_LEN - 1) { > - memcpy(strbuf, str, len); > - strbuf[len] = 0; > - entry.name = strbuf; > - /* prevent compiler from optimizing out the temporary buffer */ > - barrier(); > - } > - > - res = utf8_strncasecmp(sbi->s_encoding, name, &entry); > - if (res >= 0) > - return res; > - > - if (f2fs_has_strict_mode(sbi)) > - return -EINVAL; > -fallback: > - if (len != name->len) > - return 1; > - return !!memcmp(str, name->name, len); > -} > - > -static int f2fs_d_hash(const struct dentry *dentry, struct qstr *str) > -{ > - struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb); > - const struct unicode_map *um = sbi->s_encoding; > - const struct inode *inode = READ_ONCE(dentry->d_inode); > - unsigned char *norm; > - int len, ret = 0; > - > - if (!inode || !IS_CASEFOLDED(inode)) > - return 0; > - > - norm = f2fs_kmalloc(sbi, PATH_MAX, GFP_ATOMIC); > - if (!norm) > - return -ENOMEM; > - > - len = utf8_casefold(um, str, norm, PATH_MAX); > - if (len < 0) { > - if (f2fs_has_strict_mode(sbi)) > - ret = -EINVAL; > - goto out; > - } > - str->hash = full_name_hash(dentry, norm, len); > -out: > - kvfree(norm); > - return ret; > -} > - > const struct dentry_operations f2fs_dentry_ops = { > - .d_hash = f2fs_d_hash, > - .d_compare = f2fs_d_compare, > + .d_hash = generic_ci_d_hash, > + .d_compare = generic_ci_d_compare, > }; > #endif > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index b35a50f4953c..d11ffe26bfde 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -1402,10 +1402,6 @@ struct f2fs_sb_info { > int valid_super_block; /* valid super block no */ > unsigned long s_flag; /* flags for sbi */ > struct mutex writepages; /* mutex for writepages() */ > -#ifdef CONFIG_UNICODE > - struct unicode_map *s_encoding; > - __u16 s_encoding_flags; > -#endif > > #ifdef CONFIG_BLK_DEV_ZONED > unsigned int blocks_per_blkz; /* F2FS blocks per zone */ > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 20e56b0fa46a..cca7a83ffa08 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -1257,7 +1257,7 @@ static void f2fs_put_super(struct super_block *sb) > for (i = 0; i < NR_PAGE_TYPE; i++) > kvfree(sbi->write_io[i]); > #ifdef CONFIG_UNICODE > - utf8_unload(sbi->s_encoding); > + utf8_unload(sb->s_encoding); > #endif > kvfree(sbi); > } > @@ -3278,7 +3278,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) > static int f2fs_setup_casefold(struct f2fs_sb_info *sbi) > { > #ifdef CONFIG_UNICODE > - if (f2fs_sb_has_casefold(sbi) && !sbi->s_encoding) { > + if (f2fs_sb_has_casefold(sbi) && !sbi->sb->s_encoding) { > const struct f2fs_sb_encodings *encoding_info; > struct unicode_map *encoding; > __u16 encoding_flags; > @@ -3309,8 +3309,8 @@ static int f2fs_setup_casefold(struct f2fs_sb_info *sbi) > "%s-%s with flags 0x%hx", encoding_info->name, > encoding_info->version?:"\b", encoding_flags); > > - sbi->s_encoding = encoding; > - sbi->s_encoding_flags = encoding_flags; > + sbi->sb->s_encoding = encoding; > + sbi->sb->s_encoding_flags = encoding_flags; > sbi->sb->s_d_op = &f2fs_dentry_ops; > } > #else > @@ -3806,7 +3806,7 @@ static int f2fs_fill_super(struct super_block *sb, void > *data, int silent) > kvfree(sbi->write_io[i]); > > #ifdef CONFIG_UNICODE > - utf8_unload(sbi->s_encoding); > + utf8_unload(sb->s_encoding); > #endif > free_options: > #ifdef CONFIG_QUOTA > diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c > index e877c59b9fdb..8bee99ab3978 100644 > --- a/fs/f2fs/sysfs.c > +++ b/fs/f2fs/sysfs.c > @@ -176,12 +176,14 @@ static ssize_t encoding_show(struct f2fs_attr *a, > struct f2fs_sb_info *sbi, char *buf) > { > #ifdef CONFIG_UNICODE > + struct super_block *sb = sbi->sb; > + > if (f2fs_sb_has_casefold(sbi)) > return snprintf(buf, PAGE_SIZE, "%s (%d.%d.%d)\n", > - sbi->s_encoding->charset, > - (sbi->s_encoding->version >> 16) & 0xff, > - (sbi->s_encoding->version >> 8) & 0xff, > - sbi->s_encoding->version & 0xff); > + sb->s_encoding->charset, > + (sb->s_encoding->version >> 16) & 0xff, > + (sb->s_encoding->version >> 8) & 0xff, > + sb->s_encoding->version & 0xff); > #endif > return sprintf(buf, "(none)"); > } > diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h > index 3c383ddd92dd..a5dbb57a687f 100644 > --- a/include/linux/f2fs_fs.h > +++ b/include/linux/f2fs_fs.h > @@ -38,9 +38,6 @@ > #define F2FS_MAX_QUOTAS 3 > > #define F2FS_ENC_UTF8_12_1 1 > -#define F2FS_ENC_STRICT_MODE_FL (1 << 0) > -#define f2fs_has_strict_mode(sbi) \ > - (sbi->s_encoding_flags & F2FS_ENC_STRICT_MODE_FL) > > #define F2FS_IO_SIZE(sbi) (1 << F2FS_OPTION(sbi).write_io_size_bits) /* > Blocks */ > #define F2FS_IO_SIZE_KB(sbi) (1 << (F2FS_OPTION(sbi).write_io_size_bits + > 2)) /* KB */ > -- > 2.27.0.383.g050319c2ae-goog
