Merge "f2fs,fscrypt,ice: fix direct IO patch for f2fs" (4672201b) · Commits · e / devices / android_kernel_xiaomi_nabu

fs/direct-io.c

+25 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#include <linux/uio.h>
		#include <linux/atomic.h>
		#include <linux/prefetch.h>
		#define __FS_HAS_ENCRYPTION IS_ENABLED(CONFIG_F2FS_FS_ENCRYPTION)
		#include <linux/fscrypt.h>

		/*
		* How many user pages to map in one call to get_user_pages(). This determines
		@@ -430,6 +432,21 @@ dio_bio_alloc(struct dio dio, struct dio_submit sdio,
		sdio->logical_offset_in_bio = sdio->cur_page_fs_offset;
		}

		static bool is_inode_filesystem_type(const struct inode *inode,
		const char *fs_type)
		{
		if (!inode \|\| !fs_type)
		return false;

		if (!inode->i_sb)
		return false;

		if (!inode->i_sb->s_type)
		return false;

		return (strcmp(inode->i_sb->s_type->name, fs_type) == 0);
		}

		/*
		* In the AIO read case we speculatively dirty the pages before starting IO.
		* During IO completion, any of these pages which happen to have been written
		@@ -454,6 +471,14 @@ static inline void dio_bio_submit(struct dio dio, struct dio_submit sdio)
		dio->bio_disk = bio->bi_disk;
		bio->bi_dio_inode = dio->inode;

		/* iv sector for security/pfe/pfk_fscrypt.c and f2fs in fs/f2fs/f2fs.h */
		#define PG_DUN_NEW(i,p) \
		(((((u64)(i)->i_ino) & 0xffffffff) << 32) \| ((p) & 0xffffffff))

		if (is_inode_filesystem_type(dio->inode, "f2fs"))
		fscrypt_set_ice_dun(dio->inode, bio, PG_DUN_NEW(dio->inode,
		(sdio->logical_offset_in_bio >> PAGE_SHIFT)));

		if (sdio->submit_io) {
		sdio->submit_io(bio, dio->inode, sdio->logical_offset_in_bio);
		dio->bio_cookie = BLK_QC_T_NONE;