diff options
| author |   Amir Goldstein <amir73il@gmail.com> | 2019-11-16 18:14:41 +0200 |
|---|---|---|
| committer |   Miklos Szeredi <mszeredi@redhat.com> | 2020-01-24 09:46:45 +0100 |
| commit | 0f831ec85eda1ae27490baba106aba632c1d8e94 (patch) | |
| tree | f97b25b2abf25f78fb98a3763dee228667fd8665 /fs/overlayfs/ovl_entry.h | |
| parent | ovl: generalize the lower_layers[] array (diff) | |
| download | linux-dev-0f831ec85eda1ae27490baba106aba632c1d8e94.tar.xz linux-dev-0f831ec85eda1ae27490baba106aba632c1d8e94.zip | |
ovl: simplify ovl_same_sb() helper
No code uses the sb returned from this helper, so make it retrun a boolean
and rename it to ovl_same_fs().
The xino mode is irrelevant when all layers are on same fs, so instead of
describing samefs with mode OVL_XINO_OFF, use a new xino_mode state, which
is 0 in the case of samefs, -1 in the case of xino=off and > 0 with xino
enabled.
Create a new helper ovl_same_dev(), to use instead of the common check for
(ovl_same_fs() || xinobits).
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/ovl_entry.h')
| -rw-r--r-- | fs/overlayfs/ovl_entry.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index 64baf04cdede..9a785702a2a4 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -71,10 +71,15 @@ struct ovl_fs { struct inode *workbasedir_trap; struct inode *workdir_trap; struct inode *indexdir_trap; - /* Inode numbers in all layers do not use the high xino_bits */ - unsigned int xino_bits; + /* -1: disabled, 0: same fs, 1..32: number of unused ino bits */ + int xino_mode; }; +static inline struct ovl_fs *OVL_FS(struct super_block *sb) +{ + return (struct ovl_fs *)sb->s_fs_info; +} + /* private information held for every overlayfs dentry */ struct ovl_entry { union { |