Commit 19bdba52 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file 



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: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 325163e9

fs/f2fs/data.c

+5 −2
Original line number Diff line number Diff line
@@ -2525,6 +2525,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))
@@ -2533,8 +2538,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))

fs/f2fs/file.c

+5 −5
Original line number Diff line number Diff line
@@ -3145,17 +3145,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;