diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2021-03-01 20:37:10 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2021-03-08 10:19:35 -0500 |
| commit | 6e3e2c4362e41a2f18e3f7a5ad81bd2f49a47b85 (patch) | |
| tree | ef51a46d8ebbfa4300e6fa4f1c20b171b351bf13 /fs/overlayfs | |
| parent | Linux 5.12-rc2 (diff) | |
| download | wireguard-linux-6e3e2c4362e41a2f18e3f7a5ad81bd2f49a47b85.tar.xz wireguard-linux-6e3e2c4362e41a2f18e3f7a5ad81bd2f49a47b85.zip | |
new helper: inode_wrong_type()
inode_wrong_type(inode, mode) returns true if setting inode->i_mode
to given value would've changed the inode type. We have enough of
those checks open-coded to make a helper worthwhile.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/overlayfs')
| -rw-r--r-- | fs/overlayfs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index 3fe05fb5d145..1d573972ce22 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -371,7 +371,7 @@ int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected, return PTR_ERR(origin); if (upperdentry && !ovl_is_whiteout(upperdentry) && - ((d_inode(origin)->i_mode ^ d_inode(upperdentry)->i_mode) & S_IFMT)) + inode_wrong_type(d_inode(upperdentry), d_inode(origin)->i_mode)) goto invalid; if (!*stackp) @@ -730,7 +730,7 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper, index = ERR_PTR(-ESTALE); goto out; } else if (ovl_dentry_weird(index) || ovl_is_whiteout(index) || - ((inode->i_mode ^ d_inode(origin)->i_mode) & S_IFMT)) { + inode_wrong_type(inode, d_inode(origin)->i_mode)) { /* * Index should always be of the same file type as origin * except for the case of a whiteout index. A whiteout |