Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c44ad6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/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
parents f4a9c169 e1ff3dd1

fs/overlayfs/super.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -835,11 +835,11 @@ static struct dentry *ovl_workdir_create(struct vfsmount *mnt, 
			goto out_dput;

			goto out_dput;





		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);

		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_DEFAULT);

		if (err && err != -ENODATA)

		if (err && err != -ENODATA && err != -EOPNOTSUPP)

			goto out_dput;

			goto out_dput;





		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);

		err = vfs_removexattr(work, XATTR_NAME_POSIX_ACL_ACCESS);

		if (err && err != -ENODATA)

		if (err && err != -ENODATA && err != -EOPNOTSUPP)

			goto out_dput;

			goto out_dput;





		/* Clear any inherited mode bits */

		/* Clear any inherited mode bits */