lkml.org 
[lkml]   [2024]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v15 9/9] f2fs: Move CONFIG_UNICODE defguards into the code flow
    Date
    From: Gabriel Krisman Bertazi <krisman@collabora.com>

    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.8-rc3]
    Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com>
    ---
    fs/f2fs/namei.c | 10 ++++------
    fs/f2fs/super.c | 8 ++++----
    2 files changed, 8 insertions(+), 10 deletions(-)

    diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
    index f7f63a567d86..5da1aae7d23a 100644
    --- a/fs/f2fs/namei.c
    +++ b/fs/f2fs/namei.c
    @@ -576,8 +576,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
    goto out_iput;
    }
    out_splice:
    -#if IS_ENABLED(CONFIG_UNICODE)
    - if (!inode && IS_CASEFOLDED(dir)) {
    + if (IS_ENABLED(CONFIG_UNICODE) && !inode && IS_CASEFOLDED(dir)) {
    /* Eventually we want to call d_add_ci(dentry, NULL)
    * for negative dentries in the encoding case as
    * well. For now, prevent the negative dentry
    @@ -586,7 +585,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
    trace_f2fs_lookup_end(dir, dentry, ino, err);
    return NULL;
    }
    -#endif
    +
    new = d_splice_alias(inode, dentry);
    trace_f2fs_lookup_end(dir, !IS_ERR_OR_NULL(new) ? new : dentry,
    ino, IS_ERR(new) ? PTR_ERR(new) : err);
    @@ -639,16 +638,15 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
    f2fs_delete_entry(de, page, dir, inode);
    f2fs_unlock_op(sbi);

    -#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
    * negative dentries at f2fs_lookup(), when it is better
    * supported by the VFS for the CI case.
    */
    - if (IS_CASEFOLDED(dir))
    + if (IS_ENABLED(CONFIG_UNICODE) && IS_CASEFOLDED(dir))
    d_invalidate(dentry);
    -#endif
    +
    if (IS_DIRSYNC(dir))
    f2fs_sync_fs(sbi->sb, 1);
    fail:
    diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
    index 313024f5c90c..c4325cc066c6 100644
    --- a/fs/f2fs/super.c
    +++ b/fs/f2fs/super.c
    @@ -306,7 +306,7 @@ struct kmem_cache *f2fs_cf_name_slab;
    static int __init f2fs_create_casefold_cache(void)
    {
    f2fs_cf_name_slab = f2fs_kmem_cache_create("f2fs_casefolded_name",
    - F2FS_NAME_LEN);
    + F2FS_NAME_LEN);
    return f2fs_cf_name_slab ? 0 : -ENOMEM;
    }

    @@ -1354,13 +1354,13 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount)
    return -EINVAL;
    }
    #endif
    -#if !IS_ENABLED(CONFIG_UNICODE)
    - if (f2fs_sb_has_casefold(sbi)) {
    +
    + if (!IS_ENABLED(CONFIG_UNICODE) && f2fs_sb_has_casefold(sbi)) {
    f2fs_err(sbi,
    "Filesystem with casefold feature cannot be mounted without CONFIG_UNICODE");
    return -EINVAL;
    }
    -#endif
    +
    /*
    * The BLKZONED feature indicates that the drive was formatted with
    * zone alignment optimization. This is optional for host-aware
    --
    2.34.1

    \
     
     \ /
      Last update: 2024-05-27 16:19    [W:7.572 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site