Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46778c88 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by David Anderson
Browse files

FROMGIT: 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.

Bug: 210593661
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit 70da2736a4138b86a12873d33fefbb495e22e6f8
 git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git

 dev)
Signed-off-by: default avatarHuang Jianan <huangjianan@oppo.com>
Change-Id: I3fd33c984417c10b38e23de6cec017b03d588945
Signed-off-by: default avatarDavid Anderson <dvander@google.com>
parent 9a4b39bd

fs/f2fs/data.c

+5 −0
Original line number Diff line number Diff line
@@ -2577,6 +2577,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))

fs/f2fs/file.c

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