diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2023-11-19 21:55:00 +0300 |
|---|---|---|
| committer | Amir Goldstein <amir73il@gmail.com> | 2023-11-20 10:49:09 +0300 |
| commit | 02d70090e0e020eff440dbe51e93fe2fc94d9835 (patch) | |
| tree | add479ba3fd8b3c9010654e24d8ae929660b2516 /fs/overlayfs/export.c | |
| parent | 98b1cc82c4affc16f5598d4fa14b1858671b2263 (diff) | |
| download | linux-02d70090e0e020eff440dbe51e93fe2fc94d9835.tar.xz | |
ovl: remove redundant ofs->indexdir member
When the index feature is disabled, ofs->indexdir is NULL.
When the index feature is enabled, ofs->indexdir has the same value as
ofs->workdir and takes an extra reference.
This makes the code harder to understand when it is not always clear
that ofs->indexdir in one function is the same dentry as ofs->workdir
in another function.
Remove this redundancy, by referencing ofs->workdir directly in index
helpers and by using the ovl_indexdir() accessor in generic code.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Diffstat (limited to 'fs/overlayfs/export.c')
| -rw-r--r-- | fs/overlayfs/export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c index 7e16bbcad95e..6909c4a5da56 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c @@ -460,7 +460,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, * For decoded lower dir file handle, lookup index by origin to check * if lower dir was copied up and and/or removed. */ - if (!this && layer->idx && ofs->indexdir && !WARN_ON(!d_is_dir(real))) { + if (!this && layer->idx && ovl_indexdir(sb) && !WARN_ON(!d_is_dir(real))) { index = ovl_lookup_index(ofs, NULL, real, false); if (IS_ERR(index)) return index; @@ -733,7 +733,7 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, } /* Then lookup indexed upper/whiteout by origin fh */ - if (ofs->indexdir) { + if (ovl_indexdir(sb)) { index = ovl_get_index_fh(ofs, fh); err = PTR_ERR(index); if (IS_ERR(index)) { |