]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
f2fs: correct return value type of f2fs_fill_super
authorSheng Yong <shengyong1@huawei.com>
Wed, 11 May 2016 09:08:14 +0000 (17:08 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 16 May 2016 22:31:59 +0000 (15:31 -0700)
Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/super.c

index 28c8992da6f66824c3ac2112625beb2974a4bd90..0e54e84e06e40d561df580e5e9c5cd28f1b8b127 100644 (file)
@@ -1417,7 +1417,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
        struct f2fs_sb_info *sbi;
        struct f2fs_super_block *raw_super;
        struct inode *root;
-       long err;
+       int err;
        bool retry = true, need_fsck = false;
        char *options = NULL;
        int recovery, i, valid_super_block;
@@ -1643,7 +1643,7 @@ try_onemore:
                if (err < 0) {
                        need_fsck = true;
                        f2fs_msg(sb, KERN_ERR,
-                               "Cannot recover all fsync data errno=%ld", err);
+                               "Cannot recover all fsync data errno=%d", err);
                        goto free_kobj;
                }
        } else {
@@ -1676,7 +1676,7 @@ try_onemore:
        if (recovery) {
                err = f2fs_commit_super(sbi, true);
                f2fs_msg(sb, KERN_INFO,
-                       "Try to recover %dth superblock, ret: %ld",
+                       "Try to recover %dth superblock, ret: %d",
                        sbi->valid_super_block ? 1 : 2, err);
        }