]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
f2fs: check the generic conditions first
authorJaegeuk Kim <jaegeuk@kernel.org>
Mon, 30 Jun 2025 16:06:09 +0000 (16:06 +0000)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 1 Jul 2025 16:21:43 +0000 (16:21 +0000)
Let's return errors caught by the generic checks. This fixes generic/494 where
it expects to see EBUSY by setattr_prepare instead of EINVAL by f2fs for active
swapfile.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index bc0ca697e06449133278e795d535e368bc18ad06..bd835c4f874a9afd4a6b8985bd9dd0d6912d35e3 100644 (file)
@@ -1048,6 +1048,18 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
        if (unlikely(f2fs_cp_error(sbi)))
                return -EIO;
 
+       err = setattr_prepare(idmap, dentry, attr);
+       if (err)
+               return err;
+
+       err = fscrypt_prepare_setattr(dentry, attr);
+       if (err)
+               return err;
+
+       err = fsverity_prepare_setattr(dentry, attr);
+       if (err)
+               return err;
+
        if (unlikely(IS_IMMUTABLE(inode)))
                return -EPERM;
 
@@ -1077,18 +1089,6 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
                        return -EINVAL;
        }
 
-       err = setattr_prepare(idmap, dentry, attr);
-       if (err)
-               return err;
-
-       err = fscrypt_prepare_setattr(dentry, attr);
-       if (err)
-               return err;
-
-       err = fsverity_prepare_setattr(dentry, attr);
-       if (err)
-               return err;
-
        if (is_quota_modification(idmap, inode, attr)) {
                err = f2fs_dquot_initialize(inode);
                if (err)