ovl: change "ovl_copy_up_flags" static
PATCH 1/1 ovl: change "ovl_copy_up_flags" static
"ovl_copy_up_flags" is used in copy_up.c.
So, change it static.
Signed-off-by youngjun <[email protected]>
--- fs/overlayfs/copy_up.c | 2 +- fs/overlayfs/namei.c | 11 ++--------- fs/overlayfs/overlayfs.h | 1 - 3 files changed, 3 insertions(+), 11 deletions(-)
fs/overlayfs/copy_up.c +1 -1
@@ -895,7 +895,7 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,return err; } -int ovl_copy_up_flags (struct dentry *dentry,int flags) +static int ovl_copy_up_flags (struct dentry *dentry,int flags) {int err =0 ;const struct cred *old_cred =ovl_override_creds (dentry->d_sb);
fs/overlayfs/namei.c +2 -9
@@ -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, -struct ovl_path **stackp,unsigned int *ctrp) +struct ovl_path **stackp) {struct ovl_fh *fh =ovl_get_fh (upperdentry,OVL_XATTR_ORIGIN );int err;
@@ -406,10 +406,6 @@ static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,return err; } -if (WARN_ON (*ctrp)) -return -EIO ; - - *ctrp =1 ;return 0 ; }
@@ -861,8 +857,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, goto out; }if (upperdentry && !d.is_dir) { -unsigned int origin_ctr =0 ; -/* * Lookup copy up origin by decoding origin file handle. * 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 * to a dentry in lower layer that was moved under us. */ - err =ovl_check_origin (ofs, upperdentry, &origin_path, - &origin_ctr); + err =ovl_check_origin (ofs, upperdentry, &origin_path);if (err) goto out_put_upper;
fs/overlayfs/overlayfs.h +0 -1
@@ -483,7 +483,6 @@ void ovl_aio_request_cache_destroy(void);/* copy_up.c */ int ovl_copy_up (struct dentry *dentry);int ovl_copy_up_with_data (struct dentry *dentry); -int ovl_copy_up_flags (struct dentry *dentry,int flags);int ovl_maybe_copy_up (struct dentry *dentry,int flags);int ovl_copy_xattr (struct dentry *old,struct dentry *new);int ovl_set_attr (struct dentry *upper,struct kstat *stat);
Signature · 1 line
2.17.1
Amir Goldstein
maintainerQuoted 4 lines · youngjun
"
ovl_copy_up_flags" is used incopy_up.c.
So, change it static.
You have changes from next patch in this one
Quoted 78 lines
Signed-off-by youngjun <[email protected]>--- fs/overlayfs/copy_up.c | 2 +- fs/overlayfs/namei.c | 11 ++--------- fs/overlayfs/overlayfs.h | 1 - 3 files changed, 3 insertions(+), 11 deletions(-)fs/overlayfs/copy_up.c +1
-1@@ -895,7 +895,7 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,return err; } -int ovl_copy_up_flags (struct dentry *dentry,int flags) +static int ovl_copy_up_flags (struct dentry *dentry,int flags) {int err =0 ;const struct cred *old_cred =ovl_override_creds (dentry->d_sb);fs/overlayfs/namei.c +2
-9@@ -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, -struct ovl_path **stackp,unsigned int *ctrp) +struct ovl_path **stackp) {struct ovl_fh *fh =ovl_get_fh (upperdentry,OVL_XATTR_ORIGIN );int err;@@ -406,10 +406,6 @@ static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,return err; } -if (WARN_ON (*ctrp)) -return -EIO ; - - *ctrp =1 ;return 0 ; }@@ -861,8 +857,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, goto out; }if (upperdentry && !d.is_dir) { -unsigned int origin_ctr =0 ; -/* * Lookup copy up origin by decoding origin file handle. * 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 * to a dentry in lower layer that was moved under us. */ - err =ovl_check_origin (ofs, upperdentry, &origin_path, - &origin_ctr); + err =ovl_check_origin (ofs, upperdentry, &origin_path);if (err) goto out_put_upper;fs/overlayfs/overlayfs.h +0
-2@@ -483,7 +483,6 @@ void ovl_aio_request_cache_destroy(void);/* copy_up.c */ int ovl_copy_up (struct dentry *dentry);int ovl_copy_up_with_data (struct dentry *dentry); -int ovl_copy_up_flags (struct dentry *dentry,int flags);int ovl_maybe_copy_up (struct dentry *dentry,int flags);int ovl_copy_xattr (struct dentry *old,struct dentry *new);int ovl_set_attr (struct dentry *upper,struct kstat *stat); --2.17.1