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

Commit 9c87cd0a authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs: introduce f2fs_encrypted_file for clean-up 



commit 1958593e4fa9fa9e3e2d03b27e72af314c2891be upstream.

This patch replaces (f2fs_encrypted_inode() && S_ISREG()) with
f2fs_encrypted_file(), which gives no functional change.

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 5a3512a9

fs/f2fs/data.c

+5 −5
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ struct page *get_read_data_page(struct inode *inode, pgoff_t index, 
		.encrypted_page = NULL,

	};



	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

	if (f2fs_encrypted_file(inode))

		return read_mapping_page(mapping, index, NULL);



	page = f2fs_grab_cache_page(mapping, index, for_write);
@@ -787,7 +787,7 @@ alloc: 


static inline bool __force_buffered_io(struct inode *inode, int rw)

{

	return ((f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) ||

	return (f2fs_encrypted_file(inode) ||

			(rw == WRITE && test_opt(F2FS_I_SB(inode), LFS)) ||

			F2FS_I_SB(inode)->s_ndevs);

}
@@ -1155,7 +1155,7 @@ static struct bio *f2fs_grab_bio(struct inode *inode, block_t blkaddr, 
	struct fscrypt_ctx *ctx = NULL;

	struct bio *bio;



	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) {

	if (f2fs_encrypted_file(inode)) {

		ctx = fscrypt_get_ctx(inode, GFP_NOFS);

		if (IS_ERR(ctx))

			return ERR_CAST(ctx);
@@ -1342,7 +1342,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio) 
	struct inode *inode = fio->page->mapping->host;

	gfp_t gfp_flags = GFP_NOFS;



	if (!f2fs_encrypted_inode(inode) || !S_ISREG(inode->i_mode))

	if (!f2fs_encrypted_file(inode))

		return 0;



	/* wait for GCed encrypted page writeback */
@@ -1979,7 +1979,7 @@ repeat: 
	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

	if (f2fs_encrypted_file(inode))

		f2fs_wait_on_encrypted_page_writeback(sbi, blkaddr);



	if (len == PAGE_SIZE || PageUptodate(page))

fs/f2fs/f2fs.h

+5 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,11 @@ static inline bool f2fs_encrypted_inode(struct inode *inode) 
	return file_is_encrypt(inode);

}



static inline bool f2fs_encrypted_file(struct inode *inode)

{

	return f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode);

}



static inline void f2fs_set_encrypted_inode(struct inode *inode)

{

#ifdef CONFIG_F2FS_FS_ENCRYPTION

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ mapped: 
	f2fs_wait_on_page_writeback(page, DATA, false);



	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

	if (f2fs_encrypted_file(inode))

		f2fs_wait_on_encrypted_page_writeback(sbi, dn.data_blkaddr);



out_sem:

fs/f2fs/gc.c

+2 −3
Original line number Diff line number Diff line
@@ -831,8 +831,7 @@ next_step: 
				continue;



			/* if encrypted inode, let's go phase 3 */

			if (f2fs_encrypted_inode(inode) &&

						S_ISREG(inode->i_mode)) {

			if (f2fs_encrypted_file(inode)) {

				add_gc_inode(gc_list, inode);

				continue;

			}
@@ -873,7 +872,7 @@ next_step: 


			start_bidx = start_bidx_of_node(nofs, inode)

								+ ofs_in_node;

			if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

			if (f2fs_encrypted_file(inode))

				move_encrypted_block(inode, start_bidx, segno, off);

			else

				move_data_page(inode, start_bidx, gc_type, segno, off);

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ bool f2fs_may_inline_data(struct inode *inode) 
	if (i_size_read(inode) > MAX_INLINE_DATA(inode))

		return false;



	if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))

	if (f2fs_encrypted_file(inode))

		return false;



	return true;