diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-31 08:29:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-31 08:29:02 -0700 |
commit | d602fb6844940b23afb64d4bf70bb963c15571ee (patch) | |
tree | 16f19ec73e55f2c53cb56c81a658655f49c6dc1d /fs/proc | |
parent | f511c0b17b081562dca8ac5061dfa86db4c66cc2 (diff) | |
parent | a082c6f680da298cf075886ff032f32ccb7c5e1a (diff) | |
download | linux-d602fb6844940b23afb64d4bf70bb963c15571ee.tar.bz2 |
Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull overlayfs fixes from Miklos Szeredi:
"Fix regressions:
- missing CONFIG_EXPORTFS dependency
- failure if upper fs doesn't support xattr
- bad error cleanup
This also adds the concept of "impure" directories complementing the
"origin" marking introduced in -rc1. Together they enable getting
consistent st_ino and d_ino for directory listings.
And there's a bug fix and a cleanup as well"
* 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
ovl: filter trusted xattr for non-admin
ovl: mark upper merge dir with type origin entries "impure"
ovl: mark upper dir with type origin entries "impure"
ovl: remove unused arg from ovl_lookup_temp()
ovl: handle rename when upper doesn't support xattr
ovl: don't fail copy-up if upper doesn't support xattr
ovl: check on mount time if upper fs supports setting xattr
ovl: fix creds leak in copy up error path
ovl: select EXPORTFS
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions