simplify access to ecryptfs inodes in ->readpage() and friends (bef5bc24) · Commits · 戴 / test

fs/ecryptfs/mmap.c

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -198,7 +198,7 @@ out:
	static int ecryptfs_readpage(struct file file, struct page page)		static int ecryptfs_readpage(struct file file, struct page page)
	{		{
	struct ecryptfs_crypt_stat *crypt_stat =		struct ecryptfs_crypt_stat *crypt_stat =
	&ecryptfs_inode_to_private(file->f_path.dentry->d_inode)->crypt_stat;		&ecryptfs_inode_to_private(page->mapping->host)->crypt_stat;
	int rc = 0;		int rc = 0;

	if (!crypt_stat		if (!crypt_stat
	@@ -300,8 +300,7 @@ static int ecryptfs_write_begin(struct file *file,

	if (!PageUptodate(page)) {		if (!PageUptodate(page)) {
	struct ecryptfs_crypt_stat *crypt_stat =		struct ecryptfs_crypt_stat *crypt_stat =
	&ecryptfs_inode_to_private(		&ecryptfs_inode_to_private(mapping->host)->crypt_stat;
	file->f_path.dentry->d_inode)->crypt_stat;

	if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)		if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)
	\|\| (crypt_stat->flags & ECRYPTFS_NEW_FILE)) {		\|\| (crypt_stat->flags & ECRYPTFS_NEW_FILE)) {
	@@ -487,7 +486,7 @@ static int ecryptfs_write_end(struct file *file,
	unsigned to = from + copied;		unsigned to = from + copied;
	struct inode *ecryptfs_inode = mapping->host;		struct inode *ecryptfs_inode = mapping->host;
	struct ecryptfs_crypt_stat *crypt_stat =		struct ecryptfs_crypt_stat *crypt_stat =
	&ecryptfs_inode_to_private(file->f_path.dentry->d_inode)->crypt_stat;		&ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat;
	int rc;		int rc;

	if (crypt_stat->flags & ECRYPTFS_NEW_FILE) {		if (crypt_stat->flags & ECRYPTFS_NEW_FILE) {

Admin message