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

Commit 601b2ed3 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Greg Kroah-Hartman
Browse files

BACKPORT: f2fs: introduce FI_COMPRESS_RELEASED instead of using IMMUTABLE bit 



commit c61404153eb6 upstream.

Once we release compressed blocks, we used to set IMMUTABLE bit. But it turned
out it disallows every fs operations which we don't need for compression.

Let's just prevent writing data only.

Bug: 237904436
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Change-Id: I3f91a67da56fe26e39a776a5bc595aa809dc804b
parent d2972f90

fs/f2fs/compress.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -811,7 +811,8 @@ static int __f2fs_cluster_blocks(struct compress_ctx *cc, bool compr) 
		}

		}





		f2fs_bug_on(F2FS_I_SB(inode),

		f2fs_bug_on(F2FS_I_SB(inode),

			!compr && ret != cc->cluster_size && !IS_IMMUTABLE(inode));

			!compr && ret != cc->cluster_size &&

			!is_inode_flag_set(cc->inode, FI_COMPRESS_RELEASED));

	}

	}

fail:

fail:

	f2fs_put_dnode(&dn);

	f2fs_put_dnode(&dn);

fs/f2fs/f2fs.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -762,6 +762,7 @@ enum { 
	FI_VERITY_IN_PROGRESS,	/* building fs-verity Merkle tree */

	FI_VERITY_IN_PROGRESS,	/* building fs-verity Merkle tree */

	FI_COMPRESSED_FILE,	/* indicate file's data can be compressed */

	FI_COMPRESSED_FILE,	/* indicate file's data can be compressed */

	FI_MMAP_FILE,		/* indicate file was mmapped */

	FI_MMAP_FILE,		/* indicate file was mmapped */

	FI_COMPRESS_RELEASED,	/* compressed blocks were released */

	FI_MAX,			/* max flag, never be used */

	FI_MAX,			/* max flag, never be used */

};

};
@@ -2663,6 +2664,7 @@ static inline void __mark_inode_dirty_flag(struct inode *inode, 
	case FI_DATA_EXIST:

	case FI_DATA_EXIST:

	case FI_INLINE_DOTS:

	case FI_INLINE_DOTS:

	case FI_PIN_FILE:

	case FI_PIN_FILE:

	case FI_COMPRESS_RELEASED:

		f2fs_mark_inode_dirty_sync(inode, true);

		f2fs_mark_inode_dirty_sync(inode, true);

	}

	}

}

}
@@ -2784,6 +2786,8 @@ static inline void get_inline_info(struct inode *inode, struct f2fs_inode *ri) 
		set_bit(FI_EXTRA_ATTR, fi->flags);

		set_bit(FI_EXTRA_ATTR, fi->flags);

	if (ri->i_inline & F2FS_PIN_FILE)

	if (ri->i_inline & F2FS_PIN_FILE)

		set_bit(FI_PIN_FILE, fi->flags);

		set_bit(FI_PIN_FILE, fi->flags);

	if (ri->i_inline & F2FS_COMPRESS_RELEASED)

		set_bit(FI_COMPRESS_RELEASED, fi->flags);

}

}





static inline void set_raw_inline(struct inode *inode, struct f2fs_inode *ri)

static inline void set_raw_inline(struct inode *inode, struct f2fs_inode *ri)
@@ -2804,6 +2808,8 @@ static inline void set_raw_inline(struct inode *inode, struct f2fs_inode *ri) 
		ri->i_inline |= F2FS_EXTRA_ATTR;

		ri->i_inline |= F2FS_EXTRA_ATTR;

	if (is_inode_flag_set(inode, FI_PIN_FILE))

	if (is_inode_flag_set(inode, FI_PIN_FILE))

		ri->i_inline |= F2FS_PIN_FILE;

		ri->i_inline |= F2FS_PIN_FILE;

	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED))

		ri->i_inline |= F2FS_COMPRESS_RELEASED;

}

}





static inline int f2fs_has_extra_attr(struct inode *inode)

static inline int f2fs_has_extra_attr(struct inode *inode)

fs/f2fs/file.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -61,6 +61,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) 
	if (unlikely(IS_IMMUTABLE(inode)))

	if (unlikely(IS_IMMUTABLE(inode)))

		return VM_FAULT_SIGBUS;

		return VM_FAULT_SIGBUS;





	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED))

		return VM_FAULT_SIGBUS;



	if (unlikely(f2fs_cp_error(sbi))) {

	if (unlikely(f2fs_cp_error(sbi))) {

		err = -EIO;

		err = -EIO;

		goto err;

		goto err;
@@ -3530,7 +3533,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) 
		goto out;

		goto out;

	}

	}





	if (IS_IMMUTABLE(inode)) {

	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {

		ret = -EINVAL;

		ret = -EINVAL;

		goto out;

		goto out;

	}

	}
@@ -3539,8 +3542,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) 
	if (ret)

	if (ret)

		goto out;

		goto out;





	F2FS_I(inode)->i_flags |= F2FS_IMMUTABLE_FL;

	set_inode_flag(inode, FI_COMPRESS_RELEASED);

	f2fs_set_inode_flags(inode);

	inode->i_ctime = current_time(inode);

	inode->i_ctime = current_time(inode);

	f2fs_mark_inode_dirty_sync(inode, true);

	f2fs_mark_inode_dirty_sync(inode, true);
@@ -3695,7 +3697,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) 




	inode_lock(inode);

	inode_lock(inode);





	if (!IS_IMMUTABLE(inode)) {

	if (!is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {

		ret = -EINVAL;

		ret = -EINVAL;

		goto unlock_inode;

		goto unlock_inode;

	}

	}
@@ -3740,8 +3742,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) 
	up_write(&F2FS_I(inode)->i_mmap_sem);

	up_write(&F2FS_I(inode)->i_mmap_sem);





	if (ret >= 0) {

	if (ret >= 0) {

		F2FS_I(inode)->i_flags &= ~F2FS_IMMUTABLE_FL;

		clear_inode_flag(inode, FI_COMPRESS_RELEASED);

		f2fs_set_inode_flags(inode);

		inode->i_ctime = current_time(inode);

		inode->i_ctime = current_time(inode);

		f2fs_mark_inode_dirty_sync(inode, true);

		f2fs_mark_inode_dirty_sync(inode, true);

	}

	}
@@ -3904,6 +3905,11 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		goto unlock;

		goto unlock;

	}

	}





	if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {

		ret = -EPERM;

		goto unlock;

	}



	ret = generic_write_checks(iocb, from);

	ret = generic_write_checks(iocb, from);

	if (ret > 0) {

	if (ret > 0) {

		bool preallocated = false;

		bool preallocated = false;

include/linux/f2fs_fs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -229,6 +229,7 @@ struct f2fs_extent { 
#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries */

#define F2FS_INLINE_DOTS	0x10	/* file having implicit dot dentries */

#define F2FS_EXTRA_ATTR		0x20	/* file having extra attribute */

#define F2FS_EXTRA_ATTR		0x20	/* file having extra attribute */

#define F2FS_PIN_FILE		0x40	/* file should not be gced */

#define F2FS_PIN_FILE		0x40	/* file should not be gced */

#define F2FS_COMPRESS_RELEASED	0x80	/* file released compressed blocks */





struct f2fs_inode {

struct f2fs_inode {

	__le16 i_mode;			/* file mode */

	__le16 i_mode;			/* file mode */