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

Commit 4131f8cc authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

ANDROID: sdcardfs: Copy meta-data from lower inode 



From wrapfs commit 3ee9b365e38c ("Wrapfs: properly copy meta-data after
AIO operations from lower inode")

Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
Bug: 35766959
Change-Id: I9a789222e27a17b8d85ce61c45397d1839f9a675
parent 57968707

fs/sdcardfs/file.c

+11 −1
Original line number Diff line number Diff line
@@ -358,9 +358,12 @@ ssize_t sdcardfs_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
	get_file(lower_file); /* prevent lower_file from being released */

	iocb->ki_filp = lower_file;

	err = lower_file->f_op->read_iter(iocb, iter);

	/* ? wait IO finish to update atime as ecryptfs ? */

	iocb->ki_filp = file;

	fput(lower_file);

	/* update upper inode atime as needed */

	if (err >= 0 || err == -EIOCBQUEUED)

		fsstack_copy_attr_atime(file->f_path.dentry->d_inode,

					file_inode(lower_file));

out:

	return err;

}
@@ -384,6 +387,13 @@ ssize_t sdcardfs_write_iter(struct kiocb *iocb, struct iov_iter *iter) 
	err = lower_file->f_op->write_iter(iocb, iter);

	iocb->ki_filp = file;

	fput(lower_file);

	/* update upper inode times/sizes as needed */

	if (err >= 0 || err == -EIOCBQUEUED) {

		fsstack_copy_inode_size(file->f_path.dentry->d_inode,

					file_inode(lower_file));

		fsstack_copy_attr_times(file->f_path.dentry->d_inode,

					file_inode(lower_file));

	}

out:

	return err;

}