From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-00364e01.pphosted.com (mx0a-00364e01.pphosted.com [148.163.135.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDC434C0424 for ; Tue, 4 Aug 2026 18:52:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785869581; cv=none; b=kFNfsopbNaqEMPfaAvps7W6yEZhBcGlrkbHc3YiyEFEGM/QSg9DlwBKdU9AKQpWdMVbiwL+RWnnMX8acAQY9yEueGXfQGnzgNvA8MOmqrCgREe2AMiWot+nEjs9ywN1EnsybStQy2L7/EosXJuF4hz7D5ZJRZAfKBZZHtk0iNmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785869581; c=relaxed/simple; bh=eEBEQRS44uRWq+68HnHuSJkJWcepL1mJ0SSpfrhNU80=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JVGbodWhIhNCgNgp0ZdeVI7x7ileEnIw8WyBwO57eBWdA/ftvR8oRtB2zmaU+AVeErVY0EQ75zle0YFrKAwBuK++1ajqPGOse19SS47TImGtoW09P9qlXzSuvLEHQlEzTl4b4f4g9kHxbVLxfqhkTuxabLd7EcyxwhxHkDRZSZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu; spf=pass smtp.mailfrom=columbia.edu; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b=FZQOfS2m; arc=none smtp.client-ip=148.163.135.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=columbia.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=columbia.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=columbia.edu header.i=@columbia.edu header.b="FZQOfS2m" Received: from pps.filterd (m0167071.ppops.net [127.0.0.1]) by mx0a-00364e01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 674IYF6U1999537 for ; Tue, 4 Aug 2026 14:52:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=columbia.edu; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pps01; bh=aLyb lFTyCRkRNvHlbjBlieXQYnfG93Mvps8LThXIpPg=; b=FZQOfS2mrfDQVv1eTgY+ KoHIWPv7re0oYNY5Ak+9Hk5q72AtkKqpgtlokthMwfu7jmQ+xhBqpqTKIepB9xhZ yneWNpbAd3zsItw3SHaMvretXA8+qaOYKNdIy2mbHY6etbfVU/MT7PT4rI2duJf2 SObadpunqBBBfBBH0bcskN2hDOlTjn+dmhWIx0Z9FnqRYEARekOL413g9Prd2gAf kws3L6gGJE9ofKW/2qGu3L8D/L9n+jOo/8oGUM1LSbYoUhcQxOEfeMqBDH300VMU kNoC4WkxuLNNlJj5+5KRd8r6O+yNS22qEK9drDas3n7Wtji4lmrhWGPQq3CnQ6rS wA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-00364e01.pphosted.com (PPS) with ESMTPS id 4fujcfhv5q-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 04 Aug 2026 14:52:51 -0400 (EDT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51c0199faafso1070791cf.3 for ; Tue, 04 Aug 2026 11:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785869570; x=1786474370; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=aLyblFTyCRkRNvHlbjBlieXQYnfG93Mvps8LThXIpPg=; b=psfr/tcAPNSaTbXAmscH5fE1JE7+a95jD1sLlstOis5W6/VcQ0zWzWMXEpzLllz37R 0d7qG42rlesl2MPbtZvXvQ9br9RR1jfFdJNL2UqmQ8BSo55DS6JaCaZlG7meYuaZLILD g7oM5nN6heId7rurDv93soWQdesqbw16kR7fDMwnE/9GEAmqO+orsM6wwcAdRqzUZ84z EfLMkK8qQgitkthQ5I5LRUDrwKwRNYTcMyRdxF5T4w41mkDZqQpX2bCr1FT0cQU1Ah2O gElfoNcVXBLlcwljAoh6z7P4iA9kPuK7mbFT+J6wErguLETDTvFLl9wQDuHn+70GNOSW r51w== X-Forwarded-Encrypted: i=1; AHgh+RrM4/v/NNLf0HQYdMjfXiMmL4JzVF2arBztCUZaXm2HCT6xj4Xzyd1Zs/JaG1TKOloqDvhJKW+Nltwndwk=@vger.kernel.org X-Gm-Message-State: AOJu0YwvHxzQfXsNHkBz2aJ/pCTEM+x334/lt7uJwLLiud3p4qVmgCDD 8ZWeUg/aHueyPCgZf1iU7CmOnSJrYGLckDJWdY6sFWlwmIs4+DI/c+dDaIokUNRV5rewTxE52is Lh35+6GPL7v8sV5GbsocngK1h1L9bosL9wNqF8pwWZ6gfH0pZZkMxfXdCLz73gg== X-Gm-Gg: AR+sD11ppjXDEOwiJQI98fJ+CovAKFWQ5BETtqoJ5qSzGua9tB37cimikWCjBJ/gC7g RJWRywmVbX73uOIO3sRuSgqzL2XT2Hpnguw5BC1zMeLJET9WP3i7YChGxkfC0ZlqjYto7SywbJu NmDztXCc8do78WlwC79io9C5sOQ7tTMFdESeXMzWsfM/WxTHKHlvNsKhvt9PEOtmc57SLZK0Lx5 W14EGg6lrrG4YyId8+TmbIYqZ5QUT49XZpAQLNCqIwthJ2ahDnFmGRD7/udXfMDWgSVowpRpGbb 9OgSff08x5unj2P1WcP+cQHh1FJ0q1h3cQBJF/abg+mJBTFJ4Gm8ehAXosEdluTCsmNhgf5Xydq dLNoy7x4U X-Received: by 2002:a05:622a:345:b0:527:6dc7:5c5b with SMTP id d75a77b69052e-52ce61009cfmr11185371cf.21.1785869570484; Tue, 04 Aug 2026 11:52:50 -0700 (PDT) X-Received: by 2002:a05:622a:345:b0:527:6dc7:5c5b with SMTP id d75a77b69052e-52ce61009cfmr11184811cf.21.1785869570010; Tue, 04 Aug 2026 11:52:50 -0700 (PDT) Received: from [127.0.1.1] ([77.137.77.124]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fec232d7fsm2313275f8f.20.2026.08.04.11.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 11:52:49 -0700 (PDT) From: Tal Zussman Date: Tue, 04 Aug 2026 14:52:17 -0400 Subject: [PATCH v2 09/10] ceph: remove ceph_fscrypt_pagecache_page() and ceph_fscrypt_page_offset() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260804-remove-wait-on-page-writeback-v2-9-81f0ab065284@columbia.edu> References: <20260804-remove-wait-on-page-writeback-v2-0-81f0ab065284@columbia.edu> In-Reply-To: <20260804-remove-wait-on-page-writeback-v2-0-81f0ab065284@columbia.edu> To: Ilya Dryomov , Alex Markuze , Viacheslav Dubeyko , "Matthew Wilcox (Oracle)" , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Zi Yan Cc: ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Tal Zussman X-Mailer: b4 0.14.3-dev-d7477 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785869541; l=1581; i=tz2294@columbia.edu; s=20250528; h=from:subject:message-id; bh=eEBEQRS44uRWq+68HnHuSJkJWcepL1mJ0SSpfrhNU80=; b=ymFYHbrvN5rEjeaHcX4tJ/TZFBIdDlWxKA60/JN0KDJrq2/K4VZWWR2AOJJsHb/WIAfLsRBdE dVh0f4m20VEA7/0gLk/zQLeySGdoHYncfupyZbHlWLadTzarlMg/B7k X-Developer-Key: i=tz2294@columbia.edu; a=ed25519; pk=BIj5KdACscEOyAC0oIkeZqLB3L94fzBnDccEooxeM5Y= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfXwVHoM0Wi3Ffq TxEY1wDDBDf6EkJ3TUWjpCTdLfc4rBwF44xBosi581lKhJQSBh52ExhxXQr8t85SAsY3Y7zFsrY gSrs4cSDeO942itZsyhk0scCZNUlUio5oHHzUvIQ/uh7sk9mEmVNwcq77nCTIEvvIWslgc4Bl4F rU3wtsawkrWWkM25gFvGS+QZ++ZzX8p6T4TbGfW+jtTCAOGzjXp4spKlDtx1leJU9VyvKCuKPV5 mak5K7dR1Cklfi6+nsAz0UzMlJaL7DAQA8PFCj8C9WcMRVWzjLzTSx1BOHs9nq1znvB+VLzYqFo Nwmo5PEsBL3KXFe63WxpsIOC0rGSd948cIqPcx8uWv00iULkwmOA/KWQ68ekNJ4aEZlLB6U5iGn RMEYz5n6ljdeIMFNRq+8YS4tsXIY5Dp6hEzKVEx1vuWM0SnUq8Ncn0KMa7GeZZPBWlp6OcwQDqw 8agSC1YcT5Q802ed7Hw== X-Proofpoint-Spam-Info: AW1haW4tMjYwODA0MDE1MiBTYWx0ZWRfX5U6NMzDyM60G K3426Lj81r2dxGa2OyFl0PolDpeNxuK4zosbGzVb3fGmNahGETncx6VfNSnWpVAt1+XYM6y72lm FJKU1jR6jGG55l0TPeXrSnRdDhIWWBeA08PTIDQtE61jTgnrvW97 X-Authority-Analysis: v=2.4 cv=efcNubEH c=1 sm=1 tr=0 ts=6a723503 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=j1J1DEHOHTVaJYOjuVnKiw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=x7bEGLp0ZPQA:10 a=VkNPw1HP01LnGYTKEx00:22 a=Da8U98TiO7q1upZEImrf:22 a=79PYxaXUQd1wl-QFWJnA:22 a=jfg2DRd2ap2c96lsYj8A:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: PtM2bJ70ruKaR5vroPr0iinylgyk0JCP X-Proofpoint-ORIG-GUID: PtM2bJ70ruKaR5vroPr0iinylgyk0JCP X-Proofpoint-Virus-Version: vendor=nai engine=6900 definitions=11865 signatures=596817 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 suspectscore=0 lowpriorityscore=10 malwarescore=0 adultscore=0 impostorscore=10 clxscore=1015 bulkscore=10 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608040152 All callers have been converted to the folio equivalents, so remove these unused helpers. This also removes a use of page_offset(). Signed-off-by: Tal Zussman --- fs/ceph/crypto.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fs/ceph/crypto.h b/fs/ceph/crypto.h index 948c8b5dca06..d199dc8410fe 100644 --- a/fs/ceph/crypto.h +++ b/fs/ceph/crypto.h @@ -157,11 +157,6 @@ int ceph_fscrypt_decrypt_extents(struct inode *inode, struct page **page, int ceph_fscrypt_encrypt_pages(struct inode *inode, struct page **page, u64 off, int len); -static inline struct page *ceph_fscrypt_pagecache_page(struct page *page) -{ - return fscrypt_is_bounce_page(page) ? fscrypt_pagecache_page(page) : page; -} - static inline struct folio *ceph_fscrypt_pagecache_folio(struct folio *folio) { return fscrypt_is_bounce_folio(folio) ? fscrypt_pagecache_folio(folio) : folio; @@ -263,22 +258,12 @@ static inline int ceph_fscrypt_encrypt_pages(struct inode *inode, return 0; } -static inline struct page *ceph_fscrypt_pagecache_page(struct page *page) -{ - return page; -} - static inline struct folio *ceph_fscrypt_pagecache_folio(struct folio *folio) { return folio; } #endif /* CONFIG_FS_ENCRYPTION */ -static inline loff_t ceph_fscrypt_page_offset(struct page *page) -{ - return page_offset(ceph_fscrypt_pagecache_page(page)); -} - static inline loff_t ceph_fscrypt_folio_offset(struct folio *folio) { return folio_pos(ceph_fscrypt_pagecache_folio(folio)); -- 2.39.5