]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
f2fs: handle dqget error in f2fs_transfer_project_quota()
authorYangtao Li <frank.li@vivo.com>
Tue, 21 Feb 2023 14:45:50 +0000 (22:45 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:11:10 +0000 (23:11 +0900)
[ Upstream commit 8051692f5f23260215bfe9a72e712d93606acc5f ]

We should set the error code when dqget() failed.

Fixes: 2c1d03056991 ("f2fs: support F2FS_IOC_FS{GET,SET}XATTR")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/f2fs/file.c

index 05297427552ac00063be0aa7cbd0ef23af8a5443..23fb9861dba401cf3794e9da7d16f66798e82e2d 100644 (file)
@@ -3013,15 +3013,16 @@ int f2fs_transfer_project_quota(struct inode *inode, kprojid_t kprojid)
        struct dquot *transfer_to[MAXQUOTAS] = {};
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct super_block *sb = sbi->sb;
-       int err = 0;
+       int err;
 
        transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
-       if (!IS_ERR(transfer_to[PRJQUOTA])) {
-               err = __dquot_transfer(inode, transfer_to);
-               if (err)
-                       set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
-               dqput(transfer_to[PRJQUOTA]);
-       }
+       if (IS_ERR(transfer_to[PRJQUOTA]))
+               return PTR_ERR(transfer_to[PRJQUOTA]);
+
+       err = __dquot_transfer(inode, transfer_to);
+       if (err)
+               set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
+       dqput(transfer_to[PRJQUOTA]);
        return err;
 }