From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Eddie Horng <eddiehorng.tw@gmail.com>, linux-unionfs@vger.kernel.org
Subject: [PATCH] ovl: support stacked SEEK_HOLE/SEEK_DATA
Date: Tue, 26 Feb 2019 17:27:39 +0200 [thread overview]
Message-ID: <20190226152739.26408-1-amir73il@gmail.com> (raw)
Overlay file f_pos is the master copy that is preserved
through copy up, but only real fs knows how to SEEK_HOLE/
SEEK_DATA. So we copy f_pos from overlay file, perform the seek
on real file and copy f_pos back to overlay file.
Fixes: d1d04ef8572b ("ovl: stack file ops")
Reported-by: Eddie Horng <eddiehorng.tw@gmail.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
Miklos,
I verified no regressions with xfstests quick tests.
The improved generic/seek tests that I posted to fstests
are failing on master and passing with this fix.
Thanks,
Amir.
fs/overlayfs/file.c | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index 84dd957efa24..0d472940ce9e 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -145,11 +145,30 @@ static int ovl_release(struct inode *inode, struct file *file)
static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)
{
- struct inode *realinode = ovl_inode_real(file_inode(file));
+ struct fd real;
+ const struct cred *old_cred;
+ ssize_t ret;
- return generic_file_llseek_size(file, offset, whence,
- realinode->i_sb->s_maxbytes,
- i_size_read(realinode));
+ ret = ovl_real_fdget(file, &real);
+ if (ret)
+ return ret;
+
+ /*
+ * Overlay file f_pos is the master copy that is preserved
+ * through copy up, but only real fs knows how to SEEK_HOLE/
+ * SEEK_DATA.
+ */
+ real.file->f_pos = file->f_pos;
+
+ old_cred = ovl_override_creds(file_inode(file)->i_sb);
+ ret = vfs_llseek(real.file, offset, whence);
+ revert_creds(old_cred);
+
+ file->f_pos = real.file->f_pos;
+
+ fdput(real);
+
+ return ret;
}
static void ovl_file_accessed(struct file *file)
--
2.17.1
next reply other threads:[~2019-02-26 15:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-26 15:27 Amir Goldstein [this message]
2019-02-26 16:07 ` [PATCH] ovl: support stacked SEEK_HOLE/SEEK_DATA Miklos Szeredi
2019-02-26 17:20 ` Amir Goldstein
2019-02-26 20:32 ` Miklos Szeredi
2019-02-26 21:16 ` Amir Goldstein
2019-02-26 21:20 ` Miklos Szeredi
2019-02-27 6:49 ` Eddie Horng
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=20190226152739.26408-1-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=eddiehorng.tw@gmail.com \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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).