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

Commit 64e6651d authored by Tyler Hicks's avatar Tyler Hicks
Browse files

eCryptfs: Call lower ->flush() from ecryptfs_flush()



Since eCryptfs only calls fput() on the lower file in
ecryptfs_release(), eCryptfs should call the lower filesystem's
->flush() from ecryptfs_flush().

If the lower filesystem implements ->flush(), then eCryptfs should try
to flush out any dirty pages prior to calling the lower ->flush(). If
the lower filesystem does not implement ->flush(), then eCryptfs has no
need to do anything in ecryptfs_flush() since dirty pages are now
written out to the lower filesystem in ecryptfs_release().

Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
parent 7149f255
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -275,8 +275,14 @@ out:

static int ecryptfs_flush(struct file *file, fl_owner_t td)
{
	return file->f_mode & FMODE_WRITE
	       ? filemap_write_and_wait(file->f_mapping) : 0;
	struct file *lower_file = ecryptfs_file_to_lower(file);

	if (lower_file->f_op && lower_file->f_op->flush) {
		filemap_write_and_wait(file->f_mapping);
		return lower_file->f_op->flush(lower_file, td);
	}

	return 0;
}

static int ecryptfs_release(struct inode *inode, struct file *file)