[folded-merged] proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4.patch removed from -mm tree

* [folded-merged] proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4.patch removed from -mm tree
@ 2022-11-15 22:13 Andrew Morton
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2022-11-15 22:13 UTC (permalink / raw)
  To: mm-commits, viro, tytso, rppt, paul.gortmaker, mail, kaleshsingh,
	hannes, david, David.Laight, corbet, adobriyan, ivan, akpm


The quilt patch titled
     Subject: proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4
has been removed from the -mm tree.  Its filename was
     proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4.patch

This patch was dropped because it was folded into proc-report-open-files-as-size-in-stat-for-proc-pid-fd.patch

------------------------------------------------------
From: Ivan Babrou <ivan@cloudflare.com>
Subject: proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4
Date: Mon, 24 Oct 2022 10:31:40 -0700

return errno from proc_fd_getattr() instead of setting negative size

Link: https://lkml.kernel.org/r/20221024173140.30673-1-ivan@cloudflare.com
Signed-off-by: Ivan Babrou <ivan@cloudflare.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Anton Mitterer <mail@christoph.anton.mitterer.name>
Cc: David Hildenbrand <david@redhat.com>
Cc: David Laight <David.Laight@ACULAB.COM>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/fd.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

--- a/fs/proc/fd.c~proc-report-open-files-as-size-in-stat-for-proc-pid-fd-v4
+++ a/fs/proc/fd.c
@@ -280,11 +280,10 @@ out:
 	return 0;
 }
 
-static int proc_readfd_count(struct inode *inode)
+static int proc_readfd_count(struct inode *inode, loff_t *count)
 {
 	struct task_struct *p = get_proc_task(inode);
 	struct fdtable *fdt;
-	unsigned int open_fds = 0;
 
 	if (!p)
 		return -ENOENT;
@@ -294,7 +293,7 @@ static int proc_readfd_count(struct inod
 		rcu_read_lock();
 
 		fdt = files_fdtable(p->files);
-		open_fds = bitmap_weight(fdt->open_fds, fdt->max_fds);
+		*count = bitmap_weight(fdt->open_fds, fdt->max_fds);
 
 		rcu_read_unlock();
 	}
@@ -302,7 +301,7 @@ static int proc_readfd_count(struct inod
 
 	put_task_struct(p);
 
-	return open_fds;
+	return 0;
 }
 
 static int proc_readfd(struct file *file, struct dir_context *ctx)
@@ -350,14 +349,18 @@ static int proc_fd_getattr(struct user_n
 			u32 request_mask, unsigned int query_flags)
 {
 	struct inode *inode = d_inode(path->dentry);
+	int rv = 0;
 
 	generic_fillattr(&init_user_ns, inode, stat);
 
 	/* If it's a directory, put the number of open fds there */
-	if (S_ISDIR(inode->i_mode))
-		stat->size = proc_readfd_count(inode);
+	if (S_ISDIR(inode->i_mode)) {
+		rv = proc_readfd_count(inode, &stat->size);
+		if (rv < 0)
+			return rv;
+	}
 
-	return 0;
+	return rv;
 }
 
 const struct inode_operations proc_fd_inode_operations = {
_

Patches currently in -mm which might be from ivan@cloudflare.com are

proc-report-open-files-as-size-in-stat-for-proc-pid-fd.patch


^ permalink raw reply	[flat|nested] 2+ messages in thread