Commit ebc29b62 authored by huangjianan@oppo.com's avatar huangjianan@oppo.com Committed by Jaegeuk Kim
Browse files

f2fs: remove unnecessary IS_SWAPFILE check 



Now swapfile in f2fs directly submit IO to blockdev according to
swapfile extents reported by f2fs when swapon, therefore there is
no need to check IS_SWAPFILE when exec filesystem operation.

Signed-off-by: default avatarHuang Jianan <huangjianan@oppo.com>
Signed-off-by: default avatarGuo Weichao <guoweichao@oppo.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4260c406

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int get_data_block_dio_write(struct inode *inode, sector_t iblock, 
	return __get_data_block(inode, iblock, bh_result, create,

				F2FS_GET_BLOCK_DIO, NULL,

				f2fs_rw_hint_to_seg_type(inode->i_write_hint),

				IS_SWAPFILE(inode) ? false : true);

				true);

}



static int get_data_block_dio(struct inode *inode, sector_t iblock,

fs/f2fs/f2fs.h

+1 −2
Original line number Diff line number Diff line
@@ -4177,8 +4177,7 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, 
		if (F2FS_IO_ALIGNED(sbi))

			return true;

	}

	if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED) &&

					!IS_SWAPFILE(inode))

	if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED))

		return true;



	return false;