diff options
| author | Mateusz Guzik <mjguzik@gmail.com> | 2025-04-17 00:16:25 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-04-21 10:27:59 +0200 |
| commit | 875ccc0ddceead3998d9ffd1e68f1290efa1f9a9 (patch) | |
| tree | ffab7d2769b50a4d51c326744b1b767f194fc805 | |
| parent | 79beea2db0431536d79fc5d321225fb42f955466 (diff) | |
| download | lwn-875ccc0ddceead3998d9ffd1e68f1290efa1f9a9.tar.gz lwn-875ccc0ddceead3998d9ffd1e68f1290efa1f9a9.zip | |
fs: touch up predicts in inode_permission()
The routine only encounters errors when people try to access things they
can't, which is a negligible amount of calls.
The only questionable bit might be the pre-existing predict around
MAY_WRITE. Currently the routine is predominantly used for MAY_EXEC, so
this makes some sense.
I verified this straightens out the asm.
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Link: https://lore.kernel.org/20250416221626.2710239-2-mjguzik@gmail.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/namei.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/namei.c b/fs/namei.c index b9cc03faa033..b051211f064c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -571,14 +571,14 @@ int inode_permission(struct mnt_idmap *idmap, int retval; retval = sb_permission(inode->i_sb, inode, mask); - if (retval) + if (unlikely(retval)) return retval; if (unlikely(mask & MAY_WRITE)) { /* * Nobody gets write access to an immutable file. */ - if (IS_IMMUTABLE(inode)) + if (unlikely(IS_IMMUTABLE(inode))) return -EPERM; /* @@ -586,16 +586,16 @@ int inode_permission(struct mnt_idmap *idmap, * written back improperly if their true value is unknown * to the vfs. */ - if (HAS_UNMAPPED_ID(idmap, inode)) + if (unlikely(HAS_UNMAPPED_ID(idmap, inode))) return -EACCES; } retval = do_inode_permission(idmap, inode, mask); - if (retval) + if (unlikely(retval)) return retval; retval = devcgroup_inode_permission(inode, mask); - if (retval) + if (unlikely(retval)) return retval; return security_inode_permission(inode, mask); |