diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-09 12:56:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-09 12:56:28 -0700 |
| commit | 5c44ad6a35a9818039e301be289a1bb7ae77613e (patch) | |
| tree | 1bc9f0f47397ca28644e53c34e3a184ec4900785 | |
| parent | f4a9c169c29efea31b22aec0012ad29df6cf84d4 (diff) | |
| parent | e1ff3dd1ae52cef5b5373c8cc4ad949c2c25a71c (diff) | |
| download | linux-5c44ad6a35a9818039e301be289a1bb7ae77613e.tar.bz2 | |
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
| -rw-r--r-- | fs/overlayfs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index a4585f961bf9..e2a94a26767b 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -835,11 +835,11 @@ retry: 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 */ |