]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fs: retire now stale MAY_WRITE predicts in inode_permission()
authorMateusz Guzik <mjguzik@gmail.com>
Fri, 7 Nov 2025 14:21:49 +0000 (15:21 +0100)
committerChristian Brauner <brauner@kernel.org>
Wed, 12 Nov 2025 11:19:08 +0000 (12:19 +0100)
The primary non-MAY_WRITE consumer now uses lookup_inode_permission_may_exec().

Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Link: https://patch.msgid.link/20251107142149.989998-4-mjguzik@gmail.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/namei.c

index 94cb52b01022e8fc6db39b3a02a9174c82d77390..25cc9680e6dced3dcff3148a1ef6df2bfdcb0d6f 100644 (file)
@@ -546,7 +546,7 @@ static inline int do_inode_permission(struct mnt_idmap *idmap,
  */
 static int sb_permission(struct super_block *sb, struct inode *inode, int mask)
 {
-       if (unlikely(mask & MAY_WRITE)) {
+       if (mask & MAY_WRITE) {
                umode_t mode = inode->i_mode;
 
                /* Nobody gets write access to a read-only fs. */
@@ -577,7 +577,7 @@ int inode_permission(struct mnt_idmap *idmap,
        if (unlikely(retval))
                return retval;
 
-       if (unlikely(mask & MAY_WRITE)) {
+       if (mask & MAY_WRITE) {
                /*
                 * Nobody gets write access to an immutable file.
                 */