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

Commit c92446c8 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

ANDROID: Incremental fs: Fix scheduling while atomic error 



If an incfs file is created, then the file system is sync'd,on opening
the incfs file inode_set reads the size from the backing file from
within iget5_locked, causing this error.

Test: incfs_test passes, this no longer occurs
Bug: 156413528
Signed-off-by: default avatarPaul Lawrence <paullawrence@google.com>
Change-Id: I8939c4afa514d39d251c044d7680cfc69272669e
parent adb33b84

fs/incfs/vfs.c

+5 −2
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ struct inode_search { 
	unsigned long ino;



	struct dentry *backing_dentry;



	size_t size;

};



enum parse_parameter {
@@ -364,7 +366,7 @@ static int inode_set(struct inode *inode, void *opaque) 


		fsstack_copy_attr_all(inode, backing_inode);

		if (S_ISREG(inode->i_mode)) {

			u64 size = read_size_attr(backing_dentry);

			u64 size = search->size;



			inode->i_size = size;

			inode->i_blocks = get_blocks_count_for_size(size);
@@ -440,7 +442,8 @@ static struct inode *fetch_regular_inode(struct super_block *sb, 
	struct inode *backing_inode = d_inode(backing_dentry);

	struct inode_search search = {

		.ino = backing_inode->i_ino,

		.backing_dentry = backing_dentry

		.backing_dentry = backing_dentry,

		.size = read_size_attr(backing_dentry),

	};

	struct inode *inode = iget5_locked(sb, search.ino, inode_test,

				inode_set, &search);