summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheng Yong2016-05-11 11:08:14 +0200
committerJaegeuk Kim2016-05-17 00:31:59 +0200
commit99e3e858a486ccef93da0d4b67a71ed1c171b2fe (patch)
tree26fb4855e4f5f27dceb9d567b5a9e5f0ebb26338
parentf2fs: fix deadlock when flush inline data (diff)
downloadkernel-qcow2-linux-99e3e858a486ccef93da0d4b67a71ed1c171b2fe.tar.gz
kernel-qcow2-linux-99e3e858a486ccef93da0d4b67a71ed1c171b2fe.tar.xz
kernel-qcow2-linux-99e3e858a486ccef93da0d4b67a71ed1c171b2fe.zip
f2fs: correct return value type of f2fs_fill_super
Signed-off-by: Sheng Yong <shengyong1@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r--fs/f2fs/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 28c8992da6f6..0e54e84e06e4 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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);
}