f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file

BugLink: https://bugs.launchpad.net/bugs/1959376
commit 19bdba5265624ba6b9d9dd936a0c6ccc167cfe80 upstream.

Android OTA failed due to SBI_NEED_FSCK flag when pinning the file. Let's avoid
it since we can do in-place-updates.

Cc: stable@vger.kernel.org
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f4fd6c246c9a9543ee1ebb8fc2fe5701bbc91868..e662355cf8c9b824cfbb2018fd215112ead2b683 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2564,6 +2564,11 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
 
+       /* The below cases were checked when setting it. */
+       if (f2fs_is_pinned_file(inode))
+               return false;
+       if (fio && is_sbi_flag_set(sbi, SBI_NEED_FSCK))
+               return true;
        if (f2fs_lfs_mode(sbi))
                return true;
        if (S_ISDIR(inode->i_mode))
@@ -2572,8 +2577,6 @@ bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio)
                return true;
        if (f2fs_is_atomic_file(inode))
                return true;
-       if (is_sbi_flag_set(sbi, SBI_NEED_FSCK))
-               return true;
 
        /* swap file is migrating in aligned write mode */
        if (is_inode_flag_set(inode, FI_ALIGNED_WRITE))

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 9c8ef33bd8d32fe39610d4fd4cd3e5acc44b9345..7ed44752c7580e355b1df4d1b6e2f6a389eab75a 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3143,17 +3143,17 @@ static int f2fs_ioc_set_pin_file(struct file *filp, unsigned long arg)
 
        inode_lock(inode);
 
-       if (f2fs_should_update_outplace(inode, NULL)) {
-               ret = -EINVAL;
-               goto out;
-       }
-
        if (!pin) {
                clear_inode_flag(inode, FI_PIN_FILE);
                f2fs_i_gc_failures_write(inode, 0);
                goto done;
        }
 
+       if (f2fs_should_update_outplace(inode, NULL)) {
+               ret = -EINVAL;
+               goto out;
+       }
+
        if (f2fs_pin_file_control(inode, false)) {
                ret = -EAGAIN;
                goto out;