Commit d78a0dcf authored by youngjun's avatar youngjun Committed by Miklos Szeredi

ovl: remove not used argument in ovl_check_origin

ovl_check_origin outparam 'ctrp' argument not used by caller.  So remove
this argument.
Signed-off-by: default avataryoungjun <her0gyugyu@gmail.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 5ac8e802
...@@ -389,7 +389,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected, ...@@ -389,7 +389,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
} }
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, ...@@ -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, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment