diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 17:33:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-18 17:33:32 -0700 |
| commit | b6c0d35772468173b5d3a7f6162079611e68a1e8 (patch) | |
| tree | 8c6f3805da45a2d6f23d79fa42424cdd53f7c5e8 /fs/overlayfs/ovl_entry.h | |
| parent | 7d14df2d280fb7411eba2eb96682da0683ad97f6 (diff) | |
| parent | 5c2e9f346b815841f9bed6029ebcb06415caf640 (diff) | |
| download | linux-b6c0d35772468173b5d3a7f6162079611e68a1e8.tar.gz linux-b6c0d35772468173b5d3a7f6162079611e68a1e8.tar.bz2 linux-b6c0d35772468173b5d3a7f6162079611e68a1e8.zip | |
Merge tag 'ovl-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
Pull overlayfs fixes from Miklos Szeredi:
"Fix a regression in docker introduced by overlayfs changes in 4.19.
Also fix a couple of miscellaneous bugs"
* tag 'ovl-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
ovl: filter of trusted xattr results in audit
ovl: Fix dereferencing possible ERR_PTR()
ovl: fix regression caused by overlapping layers detection
Diffstat (limited to 'fs/overlayfs/ovl_entry.h')
| -rw-r--r-- | fs/overlayfs/ovl_entry.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index 28a2d12a1029..a8279280e88d 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -66,6 +66,7 @@ struct ovl_fs { bool workdir_locked; /* Traps in ovl inode cache */ struct inode *upperdir_trap; + struct inode *workbasedir_trap; struct inode *workdir_trap; struct inode *indexdir_trap; /* Inode numbers in all layers do not use the high xino_bits */ |