ovl: remove unneeded arg from ovl_verify_origin()

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 7d4099143a57013f657ed46e81c0df5186e3a9c0..625ed8066570607b6140a0c22c39f152135a5c81 100644 (file)
--- 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 cefe5a97d048b8ce66d5d9aabece646e70070a62..13eab09a6b6f33c04c90ad822aa8a0dbe12a4927 100644 (file)
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -249,8 +249,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 3156e908423ecd7f46d351ae8ac4755cb89699b6..be03578181d211ac03c18aad58ad469d0d6c2618 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -983,9 +983,7 @@ static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe,
        int err;
 
        /* Verify lower root is upper root origin */
-       err = ovl_verify_origin(upperpath->dentry,
-                               oe->lowerstack[0].layer->mnt,
-                               oe->lowerstack[0].dentry,
+       err = ovl_verify_origin(upperpath->dentry, oe->lowerstack[0].dentry,
                                false, true);
        if (err) {
                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,
        ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true);
        if (ofs->indexdir) {
                /* Verify upper root is index dir origin */
-               err = ovl_verify_origin(ofs->indexdir, ofs->upper_mnt,
-                                       upperpath->dentry, true, true);
+               err = ovl_verify_origin(ofs->indexdir, upperpath->dentry,
+                                       true, true);
                if (err)
                        pr_err("overlayfs: failed to verify index dir origin\n");