f2fs: remove duplicated dquot_initialize and fix error handling
authorSheng Yong <shengyong1@huawei.com>
Sat, 21 Apr 2018 06:12:50 +0000 (14:12 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 31 May 2018 18:31:47 +0000 (11:31 -0700)
This patch removes duplicated dquot_initialize in recover_orphan_inode(),
and fix the error handling if dquot_initialize fails.

Signed-off-by: Sheng Yong <shengyong1@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/checkpoint.c

index 8fc55d42ba25e7abe6b749b3feedcb6b5466014f..33d2da0067898201cf266f1fc28e34efc62ab27b 100644 (file)
@@ -589,10 +589,11 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
        }
 
        err = dquot_initialize(inode);
-       if (err)
+       if (err) {
+               iput(inode);
                goto err_out;
+       }
 
-       dquot_initialize(inode);
        clear_nlink(inode);
 
        /* truncate all the data during iput */