From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: Christian Brauner <brauner@kernel.org>
Subject: [PATCH] proc_fd_getattr(): don't bother with S_ISDIR() check
Date: Sun, 15 Jun 2025 01:33:21 +0100 [thread overview]
Message-ID: <20250615003321.GC3011112@ZenIV> (raw)
In-Reply-To: <20250615003216.GB3011112@ZenIV>
[don't really care which tree that goes through; right now it's
in viro/vfs.git #work.misc, but if somebody prefers to grab it
through a different tree, just say so]
that thing is callable only as ->i_op->getattr() instance and only
for directory inodes (/proc/*/fd and /proc/*/task/*/fd)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/proc/fd.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 37aa778d1af7..9eeccff49b2a 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -352,18 +352,9 @@ static int proc_fd_getattr(struct mnt_idmap *idmap,
u32 request_mask, unsigned int query_flags)
{
struct inode *inode = d_inode(path->dentry);
- int rv = 0;
generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
-
- /* If it's a directory, put the number of open fds there */
- if (S_ISDIR(inode->i_mode)) {
- rv = proc_readfd_count(inode, &stat->size);
- if (rv < 0)
- return rv;
- }
-
- return rv;
+ return proc_readfd_count(inode, &stat->size);
}
const struct inode_operations proc_fd_inode_operations = {
--
2.39.5
next prev parent reply other threads:[~2025-06-15 0:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-15 0:30 [PATCH] landlock: opened file never has a negative dentry Al Viro
2025-06-15 0:31 ` [PATCH] apparmor: file never has NULL f_path.mnt Al Viro
2025-06-15 0:32 ` [PATCH] don't duplicate vfs_open() in kernel_file_open() Al Viro
2025-06-15 0:33 ` Al Viro [this message]
2025-06-15 0:35 ` [PATCH] secretmem: move setting O_LARGEFILE and bumping users' count to the place where we create the file Al Viro
2025-06-15 0:47 ` [bpf_iter] get rid of redundant 3rd argument of prepare_seq_file() Al Viro
2025-06-16 4:51 ` Yonghong Song
2025-06-17 17:31 ` Alexei Starovoitov
2025-06-17 21:53 ` Al Viro
2025-06-18 0:24 ` Alexei Starovoitov
2025-06-18 0:30 ` patchwork-bot+netdevbpf
2025-06-15 21:46 ` [PATCH] secretmem: move setting O_LARGEFILE and bumping users' count to the place where we create the file Andrew Morton
2025-06-16 3:00 ` Mike Rapoport
2025-06-16 14:21 ` (subset) [PATCH] proc_fd_getattr(): don't bother with S_ISDIR() check Christian Brauner
2025-06-15 2:03 ` [PATCH] binder_ioctl_write_read(): simplify control flow a bit Al Viro
2025-06-16 10:20 ` Greg Kroah-Hartman
2025-06-16 14:17 ` [PATCH] don't duplicate vfs_open() in kernel_file_open() Christian Brauner
2025-06-16 14:18 ` (subset) " Christian Brauner
2025-06-15 2:01 ` [PATCH] selinuxfs_fill_super(): don't bother with selinuxfs_info_free() on failures Al Viro
2025-06-16 14:19 ` Christian Brauner
2025-06-24 23:44 ` Paul Moore
2025-06-25 0:57 ` Al Viro
2025-06-16 14:16 ` [PATCH] apparmor: file never has NULL f_path.mnt Christian Brauner
2025-06-16 15:36 ` Ryan Lee
2025-06-16 14:16 ` [PATCH] landlock: opened file never has a negative dentry Christian Brauner
2025-06-17 10:03 ` Mickaël Salaün
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250615003321.GC3011112@ZenIV \
--to=viro@zeniv.linux.org.uk \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox