Commit cf342d3b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jaegeuk Kim
Browse files

f2fs: add a f2fs_get_block_locked helper 



This allows to keep the f2fs_do_map_lock based locking scheme
private to data.c.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 04a91ab0

fs/f2fs/data.c

+14 −2
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index) 
	return err;

}



int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index)

static int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index)

{

	if (f2fs_lookup_read_extent_cache_block(dn->inode, index,

						&dn->data_blkaddr))
@@ -1451,7 +1451,7 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type) 
	return 0;

}



void f2fs_do_map_lock(struct f2fs_sb_info *sbi, int flag, bool lock)

static void f2fs_do_map_lock(struct f2fs_sb_info *sbi, int flag, bool lock)

{

	if (flag == F2FS_GET_BLOCK_PRE_AIO) {

		if (lock)
@@ -1466,6 +1466,18 @@ void f2fs_do_map_lock(struct f2fs_sb_info *sbi, int flag, bool lock) 
	}

}



int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode);

	int err;



	f2fs_do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, true);

	err = f2fs_get_block(dn, index);

	f2fs_do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, false);



	return err;

}



/*

 * f2fs_map_blocks() tries to find or build mapping relationship which

 * maps continuous logical blocks to physical blocks, and return such

fs/f2fs/f2fs.h

+1 −2
Original line number Diff line number Diff line
@@ -3800,7 +3800,7 @@ void f2fs_set_data_blkaddr(struct dnode_of_data *dn); 
void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);

int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);

int f2fs_reserve_new_block(struct dnode_of_data *dn);

int f2fs_get_block(struct dnode_of_data *dn, pgoff_t index);

int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index);

int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index);

struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,

			blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);
@@ -3811,7 +3811,6 @@ struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index, 
struct page *f2fs_get_new_data_page(struct inode *inode,

			struct page *ipage, pgoff_t index, bool new_i_size);

int f2fs_do_write_data_page(struct f2fs_io_info *fio);

void f2fs_do_map_lock(struct f2fs_sb_info *sbi, int flag, bool lock);

int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map,

			int create, int flag);

int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/f2fs/file.c

+1 −3
Original line number Diff line number Diff line
@@ -113,10 +113,8 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) 


	if (need_alloc) {

		/* block allocation */

		f2fs_do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, true);

		set_new_dnode(&dn, inode, NULL, NULL, 0);

		err = f2fs_get_block(&dn, page->index);

		f2fs_do_map_lock(sbi, F2FS_GET_BLOCK_PRE_AIO, false);

		err = f2fs_get_block_locked(&dn, page->index);

	}



#ifdef CONFIG_F2FS_FS_COMPRESSION