leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ovl: remove unneeded arg from ovl_verify_origin()

Browse Source 
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Amir Goldstein 2017-09-24 13:00:19 +03:00 committed by Miklos Szeredi
parent 5455f92b54
commit d976807606
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/overlayfs/namei.c
View File

@ -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;

4
fs/overlayfs/overlayfs.h
View File

@ -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);

8
fs/overlayfs/super.c
View File

@ -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");