From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: zhangyi <yi.zhang@huawei.com>, linux-unionfs@vger.kernel.org
Subject: [PATCH 1/3] ovl: remove unneeded arg from ovl_verify_origin()
Date: Tue, 7 Nov 2017 23:38:58 +0200 [thread overview]
Message-ID: <1510090740-7216-2-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1510090740-7216-1-git-send-email-amir73il@gmail.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/overlayfs/namei.c | 4 ++--
fs/overlayfs/overlayfs.h | 4 ++--
fs/overlayfs/super.c | 5 ++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 7b89f5944e04..322c6214114f 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -348,8 +348,8 @@ static int ovl_verify_origin_fh(struct dentry *dentry, const struct ovl_fh *fh)
*
* Return 0 on match, -ESTALE on mismatch, < 0 on error.
*/
-int ovl_verify_origin(struct dentry *dentry, struct vfsmount *mnt,
- struct dentry *origin, bool is_upper, bool set)
+int ovl_verify_origin(struct dentry *dentry, struct dentry *origin,
+ bool is_upper, bool set)
{
struct inode *inode;
struct ovl_fh *fh;
diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 29569bf1cc6e..bee51296db38 100644
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -251,8 +251,8 @@ static inline bool ovl_is_impuredir(struct dentry *dentry)
/* namei.c */
-int ovl_verify_origin(struct dentry *dentry, struct vfsmount *mnt,
- struct dentry *origin, bool is_upper, bool set);
+int ovl_verify_origin(struct dentry *dentry, struct dentry *origin,
+ bool is_upper, bool set);
int ovl_verify_index(struct dentry *index, struct ovl_path *lower,
unsigned int numlower);
int ovl_get_index_name(struct dentry *origin, struct qstr *name);
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 3f41ddf6bd0d..af4d3e876398 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1119,7 +1119,6 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
if (!(ovl_force_readonly(ufs)) && ufs->config.index) {
/* Verify lower root is upper root origin */
err = ovl_verify_origin(upperpath.dentry,
- oe->lowerstack[0].layer->mnt,
oe->lowerstack[0].dentry,
false, true);
if (err) {
@@ -1131,8 +1130,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
OVL_INDEXDIR_NAME, true);
if (ufs->indexdir) {
/* Verify upper root is index dir origin */
- err = ovl_verify_origin(ufs->indexdir, ufs->upper_mnt,
- upperpath.dentry, true, true);
+ err = ovl_verify_origin(ufs->indexdir, upperpath.dentry,
+ true, true);
if (err)
pr_err("overlayfs: failed to verify index dir origin\n");
--
2.7.4
next prev parent reply other threads:[~2017-11-07 21:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 21:38 [PATCH 0/3] Overlayfs restoring of origin fh Amir Goldstein
2017-11-07 21:38 ` Amir Goldstein [this message]
2017-11-07 21:38 ` [PATCH 2/3] ovl: set origin xattr for merge dir on lookup Amir Goldstein
2017-11-08 6:59 ` zhangyi (F)
2017-11-08 8:27 ` Amir Goldstein
2017-11-08 13:30 ` Amir Goldstein
2017-11-09 4:20 ` zhangyi (F)
2017-11-07 21:39 ` [PATCH 3/3] ovl: recover from whiteouts in impure dir iteration Amir Goldstein
2017-11-09 10:07 ` [PATCH 0/3] Overlayfs restoring of origin fh Miklos Szeredi
2017-11-09 11:33 ` Amir Goldstein
2017-11-09 11:46 ` zhangyi (F)
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=1510090740-7216-2-git-send-email-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=yi.zhang@huawei.com \
/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).