diff options
| author |  Amir Goldstein <amir73il@gmail.com>
| 2023-04-01 10:29:19 +0300 |
|---|---|---|
| committer | Amir Goldstein <amir73il@gmail.com>
| 2023-06-19 14:01:13 +0300 |
| commit | ac900ed4f253434e099a025fc1da3d04bc741bd3 (patch) | |
| tree | 10d864c508b597705743dfb9d08257354eb6d06e /fs/overlayfs/util.c | |
| parent | ovl: move ovl_entry into ovl_inode (diff) | |
| download | linux-ac900ed4f253434e099a025fc1da3d04bc741bd3.tar.gz linux-ac900ed4f253434e099a025fc1da3d04bc741bd3.tar.bz2 linux-ac900ed4f253434e099a025fc1da3d04bc741bd3.zip | |
ovl: deduplicate lowerpath and lowerstack[]
The ovl_inode contains a copy of lowerpath in lowerstack[0], so the
lowerpath member can be removed.
Use accessor ovl_lowerpath() to get the lowerpath whereever the member
was accessed directly.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/util.c')
| -rw-r--r-- | fs/overlayfs/util.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index c4bd901f3bda..143e6898f50d 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -306,10 +306,12 @@ struct dentry *ovl_i_dentry_upper(struct inode *inode) struct inode *ovl_i_path_real(struct inode *inode, struct path *path) { + struct ovl_path *lowerpath = ovl_lowerpath(OVL_I_E(inode)); + path->dentry = ovl_i_dentry_upper(inode); if (!path->dentry) { - path->dentry = OVL_I(inode)->lowerpath.dentry; - path->mnt = OVL_I(inode)->lowerpath.layer->mnt; + path->dentry = lowerpath->dentry; + path->mnt = lowerpath->layer->mnt; } else { path->mnt = ovl_upper_mnt(OVL_FS(inode->i_sb)); } @@ -326,9 +328,9 @@ struct inode *ovl_inode_upper(struct inode *inode) struct inode *ovl_inode_lower(struct inode *inode) { - struct dentry *lowerdentry = OVL_I(inode)->lowerpath.dentry; + struct ovl_path *lowerpath = ovl_lowerpath(OVL_I_E(inode)); - return lowerdentry ? d_inode(lowerdentry) : NULL; + return lowerpath ? d_inode(lowerpath->dentry) : NULL; } struct inode *ovl_inode_real(struct inode *inode) |