From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7485E60B78F1 for ; Wed, 4 Nov 2026 21:15:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=XsJ9j0H6 Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4jKdX50v2mz2ypW; Thu, 05 Nov 2026 08:15:49 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=172.234.252.31 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793826949; cv=none; b=BTZmEM6RzwGXkPfF9CLFL9X47AzHRj3de7kJgI6pkU5sX7coLYMmrg4+eSfMl8VPh26Mc2w81+2b2myyrwqKvYzfw1v5iJeRbRbpolMJOxqprdDL+QgdxJfyTqyeTBA5JY6j1gvFjOqevYeKAdt5pyRvPSG8P0IWdUjoEZCNHajXSvX7RbeS2fKBkePGzJihYg8HGV3cbeXpPg79yqi0624pHE775+ypKtYqEVlWHIPVxNEQFay2Fk0IevnlgtflOguMk+DYXbVLhx5mQADBkqGDZdrthzprpZeRyAheQvoZbaUzEM6mZp7rriqCKjwCozoOOKZyrIiF0zySQEJ10A== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1793826949; c=relaxed/relaxed; bh=U0Q59UIduh0leqoTNjBQdzQ852kkwJeXSefjhRMqGGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cu6zwO8lUBQJYFu//CFoa4jIpl2PBRfkUFD+2Hiip9/QXzE650qecGVhEWZMDgPKprstbZ6fIOcHppATTctuapjd7vksDokj8p83mgFJ+2gaCDl/DYIheym7EGbOY4S9rzxvkYvAbwrW0lE61+EcPB1eH+Cw1fnCByLjdi297BLAX+aftzJUNt0/GD4uggh4wFF+MsBz0HpBmh9nb8ND9Q5IuHGtGcQtxtgABaj+0GjLrEN4rhfnW+lQtspXlPyJP+YHEnxRsSHSAAraNFBS06o7zK3Q3KnXmdHUj+qUOcAXq+y4KnmN41XrBVoc9TGa3cSecaSqYasqwONguVhN1A== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=XsJ9j0H6; dkim-atps=neutral; spf=pass (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) smtp.mailfrom=kernel.org Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=XsJ9j0H6; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=172.234.252.31; helo=sea.source.kernel.org; envelope-from=brauner@kernel.org; receiver=lists.ozlabs.org) Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4jKdX42hy0z2yln for ; Thu, 05 Nov 2026 08:15:48 +1100 (AEDT) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id D99C0406CD; Wed, 4 Nov 2026 21:15:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9556B1F00A17; Wed, 4 Nov 2026 21:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1793826946; bh=U0Q59UIduh0leqoTNjBQdzQ852kkwJeXSefjhRMqGGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XsJ9j0H6OvH2xmul+I8RCLkCIDHwfVS2h1WcR8ex3uR33mFI4dv7bX75u1V/lq9Th e3cQJcDfXH0oBvbVBiCxzCuZBF/kUt7/WGEyFuNmetycA2rp625zCNXEnQWLCsg3vb I3vCa74KtBf7uVyAQYT0U/bAb5WcPqXSOuBrIkM1pihzC2kiTsYexGyr6Ge93glCGP 5L96zjzXf89GnsjBkzG+bRkGLqMWnowLYK0X36Pg+BqUFewEuqPfG8BHF8Oj693ReJ Ej3/yIlh72Ot8OQdw0EMP/VkK3jqsSgsLZulOLdCFKl/8ACtguIEQRWl7bcOHj2mse dv1UN/d7yttyw== From: Christian Brauner To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds , Jann Horn , Josef Bacik , Chris Mason , Jeff Layton , NeilBrown , Eric Dumazet , Thomas Gleixner , Al Viro , Jonathan Corbet , Christoph Hellwig , Greg Kroah-Hartman , Joel Granados , Kees Cook , Jan Kara , Jan Kara , linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org, linux-scsi@vger.kernel.org, linux-um@lists.infradead.org, linux-wireless@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, ntfs3@lists.linux.dev, platform-driver-x86@vger.kernel.org, coreteam@netfilter.org, kexec@lists.infradead.org, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org, netfilter-devel@vger.kernel.org, dri-devel@lists.freedesktop.org, ibm-acpi-devel@lists.sourceforge.net, jfs-discussion@lists.sourceforge.net, linux-alpha@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cifs@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-hwmon@vger.kernel.org, linux-mm@kvack.org, linux-sh@vger.kernel.org, linux-usb@vger.kernel.org, samba-technical@lists.samba.org, sparclinux@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-doc@vger.kernel.org, linux-serial@vger.kernel.org, linux-atm-general@lists.sourceforge.net, Takashi Iwai , linux-input@vger.kernel.org, linux-raid@vger.kernel.org, linux-ext4@vger.kernel.org, linux-modules@vger.kernel.org, linux-debuggers@vger.kernel.org, "Christian Brauner (Amutable)" , Chuck Lever Subject: [PATCH RESEND v2 1/6] proc: drop ->proc_write() Date: Wed, 4 Nov 2026 22:15:32 +0100 Message-ID: <20261104-work-procfs-cleanup-v2-1-1e6687e226b1@kernel.org> In-Reply-To: <20261104-work-procfs-cleanup-v2-0-1e6687e226b1@kernel.org> References: <20261104-work-procfs-cleanup-v2-0-1e6687e226b1@kernel.org> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , Precedence: list X-Archived-By: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=2724; i=brauner@kernel.org; h=from:subject:message-id; bh=3hPyxu11MJgR3rDFwzfEyodOiIRJzbX1gGrYBEiGElQ=; b=kA0DAAoWkcYbwGV43KIByyZiAGrroF2jlnE7hOSrOFIlSi09/aWFMXXkeIhD2GSgzI6duNilE 4h1BAAWCgAdFiEEQIc0Vx6nDHizMmkokcYbwGV43KIFAmrroF0ACgkQkcYbwGV43KJq8QD/Vky5 A2Z8MSQ0aAGkGOqqTwozgfQm5IJyxvXF2YWkxGkBAIHluATSm7ZvI8nyU5xxvJsN4r7sYjGRfY4 pZP42K2gH X-Developer-Key: i=brauner@kernel.org; a=openpgp; fpr=4880B8C9BD0E5106FC070F4F7B3C391EFEA93624 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Every writable entry implements ->proc_write_buf() now and procfs copies in what is written before it pins the entry. Remove ->proc_write(). Signed-off-by: Christian Brauner (Amutable) --- fs/proc/generic.c | 2 -- fs/proc/inode.c | 15 +-------------- include/linux/proc_fs.h | 1 - 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 9c073cb867e5..e3ae11805c0f 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -473,8 +473,6 @@ static int pde_set_flags(struct proc_dir_entry *pde) if (proc_ops->proc_mmap) pde->flags |= PROC_ENTRY_proc_mmap; if (proc_ops->proc_write_buf) { - if (WARN_ON_ONCE(proc_ops->proc_write)) - return -EINVAL; pde->flags |= PROC_ENTRY_proc_write_buf; pde->write_size = proc_ops->proc_write_size ?: PAGE_SIZE - 1; if (proc_ops->proc_flags & PROC_ENTRY_SHORT_WRITES) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index ab30a58879d5..a7ebbe334afa 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -508,14 +508,6 @@ static ssize_t proc_reg_read(struct file *file, char __user *buf, size_t count, return rv; } -static ssize_t pde_write(struct proc_dir_entry *pde, struct file *file, const char __user *buf, size_t count, loff_t *ppos) -{ - const auto write = pde->proc_ops->proc_write; - if (write) - return write(file, buf, count, ppos); - return -EIO; -} - /* * procfs copies in what is written before it pins the entry. A writer that * faults on its buffer then doesn't hold up remove_proc_entry(). @@ -550,15 +542,10 @@ static ssize_t pde_write_buf(struct proc_dir_entry *pde, struct file *file, static ssize_t proc_reg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { struct proc_dir_entry *pde = PDE(file_inode(file)); - ssize_t rv; if (pde_has_proc_write_buf(pde)) return pde_write_buf(pde, file, buf, count, ppos); - if (!pde_pin(pde)) - return -EIO; - rv = pde_write(pde, file, buf, count, ppos); - pde_unpin(pde); - return rv; + return -EIO; } /* diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 8520b18ce1f7..8c406f4d09a5 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -77,7 +77,6 @@ struct proc_ops { int (*proc_open)(struct inode *, struct file *); ssize_t (*proc_read)(struct file *, char __user *, size_t, loff_t *); ssize_t (*proc_read_iter)(struct kiocb *, struct iov_iter *); - ssize_t (*proc_write)(struct file *, const char __user *, size_t, loff_t *); /* * mandatory unless nonseekable_open() or equivalent is used, procfs * seeks seq_file entries itself -- 2.53.0