From: Dmitry Monakhov <dmonakhov@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk,
hch@infradead.org, Dmitry Monakhov <dmonakhov@openvz.org>,
tyhicks@canonical.com, ecryptfs@vger.kernel.org
Subject: [PATCH 3/4] ecryptfs: add fadvise/set_flags calbacks
Date: Sat, 18 Oct 2014 19:21:27 +0400 [thread overview]
Message-ID: <1413645688-13524-4-git-send-email-dmonakhov@openvz.org> (raw)
In-Reply-To: <1413645688-13524-1-git-send-email-dmonakhov@openvz.org>
CC: tyhicks@canonical.com
CC: ecryptfs@vger.kernel.org
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ecryptfs/file.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 4ffa35e..c84df35 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -31,6 +31,7 @@
#include <linux/security.h>
#include <linux/compat.h>
#include <linux/fs_stack.h>
+#include <linux/fadvise.h>
#include <linux/aio.h>
#include "ecryptfs_kernel.h"
@@ -333,6 +334,63 @@ ecryptfs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
#endif
+static int
+ecryptfs_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
+{
+ struct file *lower_file = NULL;
+ long rc = 0;
+
+ if (ecryptfs_file_to_private(file))
+ lower_file = ecryptfs_file_to_lower(file);
+
+ if (!lower_file || !lower_file->f_op)
+ return rc;
+
+ if (lower_file->f_op && lower_file->f_op->fadvise)
+ rc = lower_file->f_op->fadvise(lower_file, offset, len, advice);
+ else
+ rc = generic_fadvise(lower_file, offset, len, advice);
+ if (!rc)
+ generic_fadvise(file, offset, len, advice);
+
+ return rc;
+}
+
+#define ECRYPTFS_FL_MASK (O_NONBLOCK | O_NDELAY | O_NOATIME)
+static int ecryptfs_set_flags(struct file *file, unsigned flags)
+{
+ struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
+ struct dentry *ecryptfs_dentry = file->f_path.dentry;
+ struct file *lower_file = NULL;
+ int rc = 0;
+
+ mount_crypt_stat = &ecryptfs_superblock_to_private(
+ ecryptfs_dentry->d_sb)->mount_crypt_stat;
+ if ((mount_crypt_stat->flags & ECRYPTFS_ENCRYPTED_VIEW_ENABLED)
+ && (flags & O_APPEND)) {
+ printk(KERN_WARNING "Mount has encrypted view enabled; "
+ "files may only be read\n");
+ rc = -EPERM;
+ goto out;
+ }
+
+ if (ecryptfs_file_to_private(file))
+ lower_file = ecryptfs_file_to_lower(file);
+ if (!lower_file)
+ goto out;
+
+ if (lower_file->f_op && lower_file->f_op->set_flags) {
+ rc = lower_file->f_op->set_flags(lower_file,
+ flags & ECRYPTFS_FL_MASK);
+ if (rc)
+ return rc;
+ } else
+ generic_file_set_flags(file, flags & ECRYPTFS_FL_MASK);
+
+ generic_file_set_flags(file, flags & ECRYPTFS_FL_MASK);
+out:
+ return rc;
+}
const struct file_operations ecryptfs_dir_fops = {
.iterate = ecryptfs_readdir,
.read = generic_read_dir,
@@ -347,6 +405,8 @@ const struct file_operations ecryptfs_dir_fops = {
.fasync = ecryptfs_fasync,
.splice_read = generic_file_splice_read,
.llseek = default_llseek,
+ .set_flags = ecryptfs_set_flags,
+ .fadvise = ecryptfs_fadvise,
};
const struct file_operations ecryptfs_main_fops = {
@@ -367,4 +427,6 @@ const struct file_operations ecryptfs_main_fops = {
.fsync = ecryptfs_fsync,
.fasync = ecryptfs_fasync,
.splice_read = generic_file_splice_read,
+ .set_flags = ecryptfs_set_flags,
+ .fadvise = ecryptfs_fadvise,
};
--
1.7.1
next prev parent reply other threads:[~2014-10-18 15:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-18 15:21 [PATCH 0/4] fs: fcntl/fadvice fixes v2 Dmitry Monakhov
2014-10-18 15:21 ` [PATCH 1/4] fs: fcntl add set_flags wrapper -v2 Dmitry Monakhov
2014-10-18 15:21 ` [PATCH 2/4] fs: add fadvise file_operation Dmitry Monakhov
2014-10-19 14:51 ` Christoph Hellwig
2014-10-21 8:31 ` Dmitry Monakhov
2014-10-18 15:21 ` Dmitry Monakhov [this message]
2014-10-19 14:50 ` [PATCH 3/4] ecryptfs: add fadvise/set_flags calbacks Christoph Hellwig
2014-10-18 15:21 ` [PATCH 4/4] cifs: add set_flag callback Dmitry Monakhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413645688-13524-4-git-send-email-dmonakhov@openvz.org \
--to=dmonakhov@openvz.org \
--cc=ecryptfs@vger.kernel.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tyhicks@canonical.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).