From: Miklos Szeredi <mszeredi@redhat.com>
To: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 7/8] ovl: intercept fsync
Date: Thu, 1 Dec 2016 11:15:02 +0100 [thread overview]
Message-ID: <1480587303-25088-8-git-send-email-mszeredi@redhat.com> (raw)
In-Reply-To: <1480587303-25088-1-git-send-email-mszeredi@redhat.com>
Fsync is really an inode operation (AFAICS) so a doing it on a O_RDONLY
file descriptor should flush any data written through an O_WRONLY file
descriptor for example.
To make this work correctly in case the file is copied up after being
opened for read intercept the fsync fop, similarly to read_iter and mmap.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
fs/overlayfs/inode.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 210838f97777..d861aa7462c5 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -412,6 +412,24 @@ static int ovl_mmap(struct file *file, struct vm_area_struct *vma)
return file->f_op->mmap(file, vma);
}
+static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync)
+{
+ int ret;
+
+ if (likely(ovl_file_is_lower(file))) {
+ return OVL_CALL_REAL_FOP(file,
+ fsync(file, start, end, datasync));
+ }
+ file = filp_clone_open(file);
+ if (IS_ERR(file))
+ return PTR_ERR(file);
+
+ ret = vfs_fsync_range(file, start, end, datasync);
+ fput(file);
+
+ return ret;
+}
+
static struct ovl_fops *ovl_fops_find(const struct file_operations *orig)
{
struct ovl_fops *ofop;
@@ -455,9 +473,8 @@ static struct ovl_fops *ovl_fops_get(struct file *file)
ofop->fops.read_iter = ovl_read_iter;
if (orig->mmap)
ofop->fops.mmap = ovl_mmap;
-
- /* These will need to be intercepted: */
- ofop->fops.fsync = orig->fsync;
+ if (orig->fsync)
+ ofop->fops.fsync = ovl_fsync;
/*
* These should be intercepted, but they are very unlikely to be
--
2.5.5
next prev parent reply other threads:[~2016-12-01 10:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-01 10:14 [PATCH 0/8] overlayfs: fix ro/rw fd data inconsistecies Miklos Szeredi
2016-12-01 10:14 ` [PATCH 1/8] vfs: allow overlayfs to intercept file ops Miklos Szeredi
2016-12-01 10:14 ` [PATCH 2/8] vfs: export filp_clone_open() Miklos Szeredi
2016-12-01 10:14 ` [PATCH 3/8] mm: ovl: copy-up on MAP_SHARED Miklos Szeredi
2016-12-01 10:14 ` [PATCH 4/8] ovl: add infrastructure for intercepting file ops Miklos Szeredi
2016-12-01 10:15 ` [PATCH 5/8] ovl: intercept read_iter Miklos Szeredi
2016-12-01 10:15 ` [PATCH 6/8] ovl: intercept mmap Miklos Szeredi
2016-12-01 10:15 ` Miklos Szeredi [this message]
2016-12-01 10:15 ` [PATCH 8/8] Revert "ovl: Warn on copy up if a process has a R/O fd open to the lower file" Miklos Szeredi
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=1480587303-25088-8-git-send-email-mszeredi@redhat.com \
--to=mszeredi@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.