]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
f2fs: use strcmp() in parse_options()
authorEric Biggers <ebiggers@google.com>
Fri, 1 May 2020 23:35:23 +0000 (16:35 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 8 May 2020 13:55:56 +0000 (06:55 -0700)
Remove the pointless string length checks.  Just use strcmp().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index 438296e17183d15516d717ba795d758d515a5243..d0a705e493320542cc66af7d49315de6de9a6d0c 100644 (file)
@@ -427,11 +427,11 @@ static int parse_options(struct super_block *sb, char *options)
 
                        if (!name)
                                return -ENOMEM;
-                       if (strlen(name) == 2 && !strncmp(name, "on", 2)) {
+                       if (!strcmp(name, "on")) {
                                F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_ON;
-                       } else if (strlen(name) == 3 && !strncmp(name, "off", 3)) {
+                       } else if (!strcmp(name, "off")) {
                                F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_OFF;
-                       } else if (strlen(name) == 4 && !strncmp(name, "sync", 4)) {
+                       } else if (!strcmp(name, "sync")) {
                                F2FS_OPTION(sbi).bggc_mode = BGGC_MODE_SYNC;
                        } else {
                                kvfree(name);
@@ -591,16 +591,14 @@ static int parse_options(struct super_block *sb, char *options)
 
                        if (!name)
                                return -ENOMEM;
-                       if (strlen(name) == 8 &&
-                                       !strncmp(name, "adaptive", 8)) {
+                       if (!strcmp(name, "adaptive")) {
                                if (f2fs_sb_has_blkzoned(sbi)) {
                                        f2fs_warn(sbi, "adaptive mode is not allowed with zoned block device feature");
                                        kvfree(name);
                                        return -EINVAL;
                                }
                                F2FS_OPTION(sbi).fs_mode = FS_MODE_ADAPTIVE;
-                       } else if (strlen(name) == 3 &&
-                                       !strncmp(name, "lfs", 3)) {
+                       } else if (!strcmp(name, "lfs")) {
                                F2FS_OPTION(sbi).fs_mode = FS_MODE_LFS;
                        } else {
                                kvfree(name);
@@ -725,14 +723,11 @@ static int parse_options(struct super_block *sb, char *options)
                        name = match_strdup(&args[0]);
                        if (!name)
                                return -ENOMEM;
-                       if (strlen(name) == 10 &&
-                                       !strncmp(name, "user-based", 10)) {
+                       if (!strcmp(name, "user-based")) {
                                F2FS_OPTION(sbi).whint_mode = WHINT_MODE_USER;
-                       } else if (strlen(name) == 3 &&
-                                       !strncmp(name, "off", 3)) {
+                       } else if (!strcmp(name, "off")) {
                                F2FS_OPTION(sbi).whint_mode = WHINT_MODE_OFF;
-                       } else if (strlen(name) == 8 &&
-                                       !strncmp(name, "fs-based", 8)) {
+                       } else if (!strcmp(name, "fs-based")) {
                                F2FS_OPTION(sbi).whint_mode = WHINT_MODE_FS;
                        } else {
                                kvfree(name);
@@ -745,11 +740,9 @@ static int parse_options(struct super_block *sb, char *options)
                        if (!name)
                                return -ENOMEM;
 
-                       if (strlen(name) == 7 &&
-                                       !strncmp(name, "default", 7)) {
+                       if (!strcmp(name, "default")) {
                                F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_DEFAULT;
-                       } else if (strlen(name) == 5 &&
-                                       !strncmp(name, "reuse", 5)) {
+                       } else if (!strcmp(name, "reuse")) {
                                F2FS_OPTION(sbi).alloc_mode = ALLOC_MODE_REUSE;
                        } else {
                                kvfree(name);
@@ -761,14 +754,11 @@ static int parse_options(struct super_block *sb, char *options)
                        name = match_strdup(&args[0]);
                        if (!name)
                                return -ENOMEM;
-                       if (strlen(name) == 5 &&
-                                       !strncmp(name, "posix", 5)) {
+                       if (!strcmp(name, "posix")) {
                                F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_POSIX;
-                       } else if (strlen(name) == 6 &&
-                                       !strncmp(name, "strict", 6)) {
+                       } else if (!strcmp(name, "strict")) {
                                F2FS_OPTION(sbi).fsync_mode = FSYNC_MODE_STRICT;
-                       } else if (strlen(name) == 9 &&
-                                       !strncmp(name, "nobarrier", 9)) {
+                       } else if (!strcmp(name, "nobarrier")) {
                                F2FS_OPTION(sbi).fsync_mode =
                                                        FSYNC_MODE_NOBARRIER;
                        } else {
@@ -823,15 +813,13 @@ static int parse_options(struct super_block *sb, char *options)
                        name = match_strdup(&args[0]);
                        if (!name)
                                return -ENOMEM;
-                       if (strlen(name) == 3 && !strcmp(name, "lzo")) {
+                       if (!strcmp(name, "lzo")) {
                                F2FS_OPTION(sbi).compress_algorithm =
                                                                COMPRESS_LZO;
-                       } else if (strlen(name) == 3 &&
-                                       !strcmp(name, "lz4")) {
+                       } else if (!strcmp(name, "lz4")) {
                                F2FS_OPTION(sbi).compress_algorithm =
                                                                COMPRESS_LZ4;
-                       } else if (strlen(name) == 4 &&
-                                       !strcmp(name, "zstd")) {
+                       } else if (!strcmp(name, "zstd")) {
                                F2FS_OPTION(sbi).compress_algorithm =
                                                                COMPRESS_ZSTD;
                        } else {