Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/overlayfs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/overlayfs/overlayfs.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/overlayfs/super.c

+3 −5
Original line number Diff line number Diff line
@@ -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");