f2fs: simplify f2fs_sb_read_encoding

Return the encoding table as the return value instead of as an argument,
and don't bother with the encoding flags as the caller can handle that
trivially.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 78ebc306ee2b544f159c5d7e872388930c8f35f5..4c457100f18ea3c7e40fcbbc61b4d149373b7332 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -264,24 +264,17 @@ static const struct f2fs_sb_encodings {
        {F2FS_ENC_UTF8_12_1, "utf8", "12.1.0"},
 };
 
-static int f2fs_sb_read_encoding(const struct f2fs_super_block *sb,
-                                const struct f2fs_sb_encodings **encoding,
-                                __u16 *flags)
+static const struct f2fs_sb_encodings *
+f2fs_sb_read_encoding(const struct f2fs_super_block *sb)
 {
        __u16 magic = le16_to_cpu(sb->s_encoding);
        int i;
 
        for (i = 0; i < ARRAY_SIZE(f2fs_sb_encoding_map); i++)
                if (magic == f2fs_sb_encoding_map[i].magic)
-                       break;
-
-       if (i >= ARRAY_SIZE(f2fs_sb_encoding_map))
-               return -EINVAL;
+                       return &f2fs_sb_encoding_map[i];
 
-       *encoding = &f2fs_sb_encoding_map[i];
-       *flags = le16_to_cpu(sb->s_encoding_flags);
-
-       return 0;
+       return NULL;
 }
 
 struct kmem_cache *f2fs_cf_name_slab;
@@ -3843,13 +3836,14 @@ static int f2fs_setup_casefold(struct f2fs_sb_info *sbi)
                struct unicode_map *encoding;
                __u16 encoding_flags;
 
-               if (f2fs_sb_read_encoding(sbi->raw_super, &encoding_info,
-                                         &encoding_flags)) {
+               encoding_info = f2fs_sb_read_encoding(sbi->raw_super);
+               if (!encoding_info) {
                        f2fs_err(sbi,
                                 "Encoding requested by superblock is unknown");
                        return -EINVAL;
                }
 
+               encoding_flags = le16_to_cpu(sbi->raw_super->s_encoding_flags);
                encoding = utf8_load(encoding_info->version);
                if (IS_ERR(encoding)) {
                        f2fs_err(sbi,