Skip to content

Commit

Permalink
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/mszeredi/vfs

Pull overlayfs fix from Miklos Szeredi:
 "This fixes a regression caused by the last pull request"

* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix workdir creation
  • Loading branch information
torvalds committed Sep 9, 2016
2 parents f4a9c16 + e1ff3dd commit 5c44ad6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fs/overlayfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -835,11 +835,11 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt,
goto out_dput;

err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);
if (err && err != -ENODATA)
if (err && err != -ENODATA && err != -EOPNOTSUPP)
goto out_dput;

err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);
if (err && err != -ENODATA)
if (err && err != -ENODATA && err != -EOPNOTSUPP)
goto out_dput;

/* Clear any inherited mode bits */
Expand Down

0 comments on commit 5c44ad6

Please sign in to comment.