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

Commit 9431401c authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs: use generic terms used for encrypted block management 



commit d4c759ee5faa51e0b0ee55d8a229ba5b80c4917e upstream.

This patch renames functions regarding to buffer management via META_MAPPING
used for encrypted blocks especially. We can actually use them in generic way.

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

fs/f2fs/data.c

+3 −3
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static struct bio *f2fs_grab_bio(struct inode *inode, block_t blkaddr, 
			return ERR_CAST(ctx);



		/* wait the page to be moved by cleaning */

		f2fs_wait_on_encrypted_page_writeback(sbi, blkaddr);

		f2fs_wait_on_block_writeback(sbi, blkaddr);

	}



	bio = bio_alloc(GFP_KERNEL, min_t(int, nr_pages, BIO_MAX_PAGES));
@@ -1346,7 +1346,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio) 
		return 0;



	/* wait for GCed encrypted page writeback */

	f2fs_wait_on_encrypted_page_writeback(fio->sbi, fio->old_blkaddr);

	f2fs_wait_on_block_writeback(fio->sbi, fio->old_blkaddr);



retry_encrypt:

	fio->encrypted_page = fscrypt_encrypt_page(inode, fio->page,
@@ -1980,7 +1980,7 @@ repeat: 


	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_file(inode))

		f2fs_wait_on_encrypted_page_writeback(sbi, blkaddr);

		f2fs_wait_on_block_writeback(sbi, blkaddr);



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

		return 0;

fs/f2fs/f2fs.h

+1 −2
Original line number Diff line number Diff line
@@ -2664,8 +2664,7 @@ void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, 
			struct f2fs_io_info *fio, bool add_list);

void f2fs_wait_on_page_writeback(struct page *page,

			enum page_type type, bool ordered);

void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *sbi,

			block_t blkaddr);

void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr);

void write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

void write_node_summaries(struct f2fs_sb_info *sbi, block_t start_blk);

int lookup_journal_in_cursum(struct f2fs_journal *journal, int type,

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ mapped: 


	/* wait for GCed encrypted page writeback */

	if (f2fs_encrypted_file(inode))

		f2fs_wait_on_encrypted_page_writeback(sbi, dn.data_blkaddr);

		f2fs_wait_on_block_writeback(sbi, dn.data_blkaddr);



out_sem:

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

fs/f2fs/gc.c

+9 −4
Original line number Diff line number Diff line
@@ -599,7 +599,11 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, 
	return true;

}



static void move_encrypted_block(struct inode *inode, block_t bidx,

/*

 * Move data block via META_MAPPING while keeping locked data page.

 * This can be used to move blocks, aka LBAs, directly on disk.

 */

static void move_data_block(struct inode *inode, block_t bidx,

					unsigned int segno, int off)

{

	struct f2fs_io_info fio = {
@@ -873,9 +877,10 @@ next_step: 
			start_bidx = start_bidx_of_node(nofs, inode)

								+ ofs_in_node;

			if (f2fs_encrypted_file(inode))

				move_encrypted_block(inode, start_bidx, segno, off);

				move_data_block(inode, start_bidx, segno, off);

			else

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

				move_data_page(inode, start_bidx, gc_type,

								segno, off);



			if (locked) {

				up_write(&fi->dio_rwsem[WRITE]);

fs/f2fs/segment.c

+1 −2
Original line number Diff line number Diff line
@@ -2608,8 +2608,7 @@ void f2fs_wait_on_page_writeback(struct page *page, 
	}

}



void f2fs_wait_on_encrypted_page_writeback(struct f2fs_sb_info *sbi,

							block_t blkaddr)

void f2fs_wait_on_block_writeback(struct f2fs_sb_info *sbi, block_t blkaddr)

{

	struct page *cpage;