summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs/super.c
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2017-09-24 06:00:19 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2017-11-10 03:39:16 -0500
commitd9768076068f81687b3dbddbd76b5e108f5d53d0 (patch)
treed573844434ccb2c0fc6b780db4023d7a8d7a3432 /fs/overlayfs/super.c
parent5455f92b54e516995a9ca45bbf790d3629c27a93 (diff)
ovl: remove unneeded arg from ovl_verify_origin()
Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/super.c')
-rw-r--r--fs/overlayfs/super.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 3156e908423e..be03578181d2 100644
--- 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,
983 int err; 983 int err;
984 984
985 /* Verify lower root is upper root origin */ 985 /* Verify lower root is upper root origin */
986 err = ovl_verify_origin(upperpath->dentry, 986 err = ovl_verify_origin(upperpath->dentry, oe->lowerstack[0].dentry,
987 oe->lowerstack[0].layer->mnt,
988 oe->lowerstack[0].dentry,
989 false, true); 987 false, true);
990 if (err) { 988 if (err) {
991 pr_err("overlayfs: failed to verify upper root origin\n"); 989 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 ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true); 993 ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true);
996 if (ofs->indexdir) { 994 if (ofs->indexdir) {
997 /* Verify upper root is index dir origin */ 995 /* Verify upper root is index dir origin */
998 err = ovl_verify_origin(ofs->indexdir, ofs->upper_mnt, 996 err = ovl_verify_origin(ofs->indexdir, upperpath->dentry,
999 upperpath->dentry, true, true); 997 true, true);
1000 if (err) 998 if (err)
1001 pr_err("overlayfs: failed to verify index dir origin\n"); 999 pr_err("overlayfs: failed to verify index dir origin\n");
1002 1000