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

ovl: remove not used argument in ovl_check_origin

Browse Source 
ovl_check_origin outparam 'ctrp' argument not used by caller.  So remove
this argument.

Signed-off-by: youngjun <her0gyugyu@gmail.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
youngjun 2020-06-21 05:50:01 -07:00 committed by Miklos Szeredi
parent 5ac8e8025a
commit d78a0dcf64
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/overlayfs/namei.c
View File

@ -389,7 +389,7 @@ invalid:
} }
static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry, static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,
struct ovl_path **stackp, unsigned int *ctrp) struct ovl_path **stackp)
{ {
struct ovl_fh *fh = ovl_get_fh(upperdentry, OVL_XATTR_ORIGIN); struct ovl_fh *fh = ovl_get_fh(upperdentry, OVL_XATTR_ORIGIN);
int err; int err;
@ -406,10 +406,6 @@ static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,
return err; return err;
} }
if (WARN_ON(*ctrp))
return -EIO;
*ctrp = 1;
return 0; return 0;
} }
@ -861,8 +857,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
goto out; goto out;
} }
if (upperdentry && !d.is_dir) { if (upperdentry && !d.is_dir) {
unsigned int origin_ctr = 0;
/* /*
* Lookup copy up origin by decoding origin file handle. * Lookup copy up origin by decoding origin file handle.
* We may get a disconnected dentry, which is fine, * We may get a disconnected dentry, which is fine,
@ -873,8 +867,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
* number - it's the same as if we held a reference * number - it's the same as if we held a reference
* to a dentry in lower layer that was moved under us. * to a dentry in lower layer that was moved under us.
*/ */
err = ovl_check_origin(ofs, upperdentry, &origin_path, err = ovl_check_origin(ofs, upperdentry, &origin_path);
&origin_ctr);
if (err) if (err)
goto out_put_upper; goto out_put_upper;