Skip to content

Commit

Permalink
ovl: don't check sticky
Browse files Browse the repository at this point in the history
Since commit 07a2daa ("ovl: Copy up underlying inode's ->i_mode to
overlay inode") sticky checking on overlay inode is performed by the vfs,
so checking against sticky on underlying inode is not needed.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Miklos Szeredi committed Dec 16, 2016
1 parent 804032f commit 99f5d08
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions fs/overlayfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -717,28 +717,12 @@ static int ovl_remove_upper(struct dentry *dentry, bool is_dir)
return err;
}

static inline int ovl_check_sticky(struct dentry *dentry)
{
struct inode *dir = ovl_dentry_real(dentry->d_parent)->d_inode;
struct inode *inode = ovl_dentry_real(dentry)->d_inode;

if (check_sticky(dir, inode))
return -EPERM;

return 0;
}

static int ovl_do_remove(struct dentry *dentry, bool is_dir)
{
enum ovl_path_type type;
int err;
const struct cred *old_cred;


err = ovl_check_sticky(dentry);
if (err)
goto out;

err = ovl_want_write(dentry);
if (err)
goto out;
Expand Down Expand Up @@ -804,21 +788,13 @@ static int ovl_rename(struct inode *olddir, struct dentry *old,

flags &= ~RENAME_NOREPLACE;

err = ovl_check_sticky(old);
if (err)
goto out;

/* Don't copy up directory trees */
old_type = ovl_path_type(old);
err = -EXDEV;
if (OVL_TYPE_MERGE_OR_LOWER(old_type) && is_dir)
goto out;

if (new->d_inode) {
err = ovl_check_sticky(new);
if (err)
goto out;

if (d_is_dir(new))
new_is_dir = true;

Expand Down

0 comments on commit 99f5d08

Please sign in to comment.