Commit d9768076 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi

ovl: remove unneeded arg from ovl_verify_origin()

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 5455f92b
...@@ -348,8 +348,8 @@ static int ovl_verify_origin_fh(struct dentry *dentry, const struct ovl_fh *fh) ...@@ -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. * Return 0 on match, -ESTALE on mismatch, < 0 on error.
*/ */
int ovl_verify_origin(struct dentry *dentry, struct vfsmount *mnt, int ovl_verify_origin(struct dentry *dentry, struct dentry *origin,
struct dentry *origin, bool is_upper, bool set) bool is_upper, bool set)
{ {
struct inode *inode; struct inode *inode;
struct ovl_fh *fh; struct ovl_fh *fh;
......
...@@ -249,8 +249,8 @@ static inline bool ovl_is_impuredir(struct dentry *dentry) ...@@ -249,8 +249,8 @@ static inline bool ovl_is_impuredir(struct dentry *dentry)
/* namei.c */ /* namei.c */
int ovl_verify_origin(struct dentry *dentry, struct vfsmount *mnt, int ovl_verify_origin(struct dentry *dentry, struct dentry *origin,
struct dentry *origin, bool is_upper, bool set); bool is_upper, bool set);
int ovl_verify_index(struct dentry *index, struct ovl_path *lower, int ovl_verify_index(struct dentry *index, struct ovl_path *lower,
unsigned int numlower); unsigned int numlower);
int ovl_get_index_name(struct dentry *origin, struct qstr *name); int ovl_get_index_name(struct dentry *origin, struct qstr *name);
......
...@@ -983,9 +983,7 @@ static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe, ...@@ -983,9 +983,7 @@ static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe,
int err; int err;
/* Verify lower root is upper root origin */ /* Verify lower root is upper root origin */
err = ovl_verify_origin(upperpath->dentry, err = ovl_verify_origin(upperpath->dentry, oe->lowerstack[0].dentry,
oe->lowerstack[0].layer->mnt,
oe->lowerstack[0].dentry,
false, true); false, true);
if (err) { if (err) {
pr_err("overlayfs: failed to verify upper root origin\n"); pr_err("overlayfs: failed to verify upper root origin\n");
...@@ -995,8 +993,8 @@ static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe, ...@@ -995,8 +993,8 @@ static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe,
ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true); ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true);
if (ofs->indexdir) { if (ofs->indexdir) {
/* Verify upper root is index dir origin */ /* Verify upper root is index dir origin */
err = ovl_verify_origin(ofs->indexdir, ofs->upper_mnt, err = ovl_verify_origin(ofs->indexdir, upperpath->dentry,
upperpath->dentry, true, true); true, true);
if (err) if (err)
pr_err("overlayfs: failed to verify index dir origin\n"); pr_err("overlayfs: failed to verify index dir origin\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment