From patchwork Sat Nov 16 15:14:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 13877618 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71738D68BE6 for ; Sat, 16 Nov 2024 15:14:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7BD49C001A; Sat, 16 Nov 2024 10:14:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A03E19C0018; Sat, 16 Nov 2024 10:14:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87DDB9C001A; Sat, 16 Nov 2024 10:14:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 636089C0018 for ; Sat, 16 Nov 2024 10:14:54 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 263E2C1BF6 for ; Sat, 16 Nov 2024 15:14:54 +0000 (UTC) X-FDA: 82792303734.27.FF2E207 Received: from mx.treblig.org (mx.treblig.org [46.235.229.95]) by imf04.hostedemail.com (Postfix) with ESMTP id 4AC1C40018 for ; Sat, 16 Nov 2024 15:13:53 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=treblig.org header.s=bytemarkmx header.b=dEtA5uST; dmarc=pass (policy=none) header.from=treblig.org; spf=pass (imf04.hostedemail.com: domain of linux@treblig.org designates 46.235.229.95 as permitted sender) smtp.mailfrom=linux@treblig.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731770003; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=+0extUEjVm7z5Ue/B1qKSYMZ5TW6HJx8FZm8Lh/lwwc=; b=kH9FAbpJ28Rj7anSRR5fPQEyyLiTBobDiCPbqmN71K/dlct3CpynYCRB9631fftvjcxADe c00Kn9I6FKEWeVypXTm+8wy873KZSvgIJOPNHUTDgukHim6pGU3cfhXrjiGixrmhdwvAxd mPfxOiyx+CgfrU5P4qQ8tTk99SvKzAo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=treblig.org header.s=bytemarkmx header.b=dEtA5uST; dmarc=pass (policy=none) header.from=treblig.org; spf=pass (imf04.hostedemail.com: domain of linux@treblig.org designates 46.235.229.95 as permitted sender) smtp.mailfrom=linux@treblig.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731770003; a=rsa-sha256; cv=none; b=uAEEg5f9nFI5V10tZg3aeOEoTYExhaVvEvtj3ASrEKE5964XslrAPXI0ZLoWOd8ici/L10 1bMGTsOagcKf4sycEJOizPq4grxK8bm1EwA7+Kl08xilNUSVbYAbBoOCNDf+hs59ESXnkF TIqUT+pN/HT9drlackXkMFSe3jYgNw0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=+0extUEjVm7z5Ue/B1qKSYMZ5TW6HJx8FZm8Lh/lwwc=; b=dEtA5uSTFAQQQZZC oH1LFfT5zoZM9JOA91yS0QtnAOA7VniTJ3D4z5ENVudnGLhWztNqv6k16mkvkez/1J7Ow2BXd8BWB 3xM/sldeiAVUK2buun5WuTTMTKJwwg0wSOXfqy0mAr/hWCsdja/DAd8+uyYGq3RdX/D/QGQeJvjTG acLer2XzFocF4TlxhicSSGvYm0/g4DPjCUZUUpiSxoxKxi8qEAxRHyPris8ZbECtKRAdg0blKnALF Mr2zM4k591nmLDlq9FriJ8qPWE8ue3rbo0fyPPXpLcl2cUcwFvB+NqEXGW/I59tkji/Dhwc5XUmGT 1oxE56rQT9oWma6g/w==; Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1tCKVb-000INb-0j; Sat, 16 Nov 2024 15:14:47 +0000 From: linux@treblig.org To: willy@infradead.org, akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Dr. David Alan Gilbert" Subject: [PATCH] filemap: Remove unused folio_add_wait_queue Date: Sat, 16 Nov 2024 15:14:46 +0000 Message-ID: <20241116151446.95555-1-linux@treblig.org> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 4AC1C40018 X-Stat-Signature: btziya3rrr73zi1n9idoodsz6fa34h1i X-HE-Tag: 1731770033-174363 X-HE-Meta: U2FsdGVkX19IftSUUX6gSpJwvTieGu1NekEiP9SlURw3Q0IsH7y20qxmqRgVQjGP9071BMg86dTOMIhxn3xNZ1h9Hwx6uPX6ANCS6m9WKPlwYJJ2yYMee2hkcVFZ8E3GneB0Y+idjSWdur7AwG5rgxe2abPpfAr5jmA2otEAUELDSGkoZxBZqca1p0uZ+SW9iBuUHHuShIOVbyw+U/Xt2Rs5s8YAJLvo+MaojyISpgs+Vp6gJMGSySQh+ojhCCaC6hie/FX2zL4qHhVvhTDHNYD6NY4WUkmrdRkdtjxMG6aEcADEKijGD4HFA5Wi57mzsasX4jrpI3mEFLDNxtAUNmt3b85z7g4fCkCv6bNvQ8jqOpfZmL3k4SDI4oYD/+s39ciuBX9lPQMm0E9F5cibq/vetVptyAoG/uWv8ASA0a79Ngiww/YOPEBVKol0Ldlsdr6NmMOPNbaoKMTXVklTHX2sQGzEC/o509rjR6VOsrz6x9xECGl55OsGx0FbZClVI4y3RSd1vMeVJme/fqngM8ZDhmWSNztlgcP2cTvEO1+hmyMaXewOnZRkUsGEfYLYYjsZtOCnFLtwOofmabFcPIlzOXEAbx9UKmLWeHnupVw4CRiD+/4vRnGrZWkRA72PZnzApMG9E3HSXInxiUDBLpx8g0ykH/vAhl+6p/ErsFGMClXdNMFXHHZy+gj9xA4m+8GuW9NYvevM1MEFaZusFl29nhkLChDcJmOMp+/JLmX+5F96wL8o2uqJ0IEsLCmP0XPDUeEw2mp6hvidMelsuGerjV6gNOkMeyUTrfRdkHuAQnHg1PDDbAd04VjVY4K1P2fqqbGrLuG6auAT3GqG8fMMxCR0KqPxkZF3oGcvjFOy/3MMETxsjJ52yN4pNp2EQtMQZ96ZVg19WrA8G2rd7iQQL8LbDsnSd1kzUiP+F7VulNMVoqq6RKEznNfk22jbdakh7K1mQXB7nhKMQFX js+c2Axs C49yObmf1Xp03oUruysDUR06eAWGz1/EE4tuDQlq+/L70yrjGCc23ITlKMjfnoVFWN2BFyFIaHLnYn9OuKraVT7GpD9ycwLR0PpD8aXQYVqNqHQpTEwNx1lmOpS5vWm3awnE7fhkIrF543GIIaMRErGs6gkZbALsFg+d520wLAoMzeAls0Gndptwc3PnPiMlq5LOMnRx6AJH/8N/zef2ujzxlzz0mXirXei7+z1q5r66EzsUyKnSwRSqKfbHbBTOQrEMkCSlb0/hJYeBu+3bkx7rZRw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Dr. David Alan Gilbert" folio_add_wait_queue() has been unused since 2021's commit 850cba069c26 ("cachefiles: Delete the cachefiles driver pending rewrite") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Hildenbrand Reviewed-by: Vishal Moola (Oracle) --- include/linux/pagemap.h | 5 ----- mm/filemap.c | 19 ------------------- 2 files changed, 24 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 68a5f1ff3301..4650416cbf6c 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1267,11 +1267,6 @@ void folio_end_private_2(struct folio *folio); void folio_wait_private_2(struct folio *folio); int folio_wait_private_2_killable(struct folio *folio); -/* - * Add an arbitrary waiter to a page's wait queue - */ -void folio_add_wait_queue(struct folio *folio, wait_queue_entry_t *waiter); - /* * Fault in userspace address range. */ diff --git a/mm/filemap.c b/mm/filemap.c index 56fa431c52af..b1bdd8ce7f49 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1473,25 +1473,6 @@ static int folio_put_wait_locked(struct folio *folio, int state) return folio_wait_bit_common(folio, PG_locked, state, DROP); } -/** - * folio_add_wait_queue - Add an arbitrary waiter to a folio's wait queue - * @folio: Folio defining the wait queue of interest - * @waiter: Waiter to add to the queue - * - * Add an arbitrary @waiter to the wait queue for the nominated @folio. - */ -void folio_add_wait_queue(struct folio *folio, wait_queue_entry_t *waiter) -{ - wait_queue_head_t *q = folio_waitqueue(folio); - unsigned long flags; - - spin_lock_irqsave(&q->lock, flags); - __add_wait_queue_entry_tail(q, waiter); - folio_set_waiters(folio); - spin_unlock_irqrestore(&q->lock, flags); -} -EXPORT_SYMBOL_GPL(folio_add_wait_queue); - /** * folio_unlock - Unlock a locked folio. * @folio: The folio.