From patchwork Tue Dec 10 22:02:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902183 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 18FE4E77182 for ; Tue, 10 Dec 2024 22:03:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5301E6B00A7; Tue, 10 Dec 2024 17:02:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D61F8D0017; Tue, 10 Dec 2024 17:02:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E83658D001C; Tue, 10 Dec 2024 17:02:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A96CD8D0017 for ; Tue, 10 Dec 2024 17:02:50 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 64E0742956 for ; Tue, 10 Dec 2024 22:02:50 +0000 (UTC) X-FDA: 82880424396.18.4CAD1EE Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf28.hostedemail.com (Postfix) with ESMTP id 0B6B2C001D for ; Tue, 10 Dec 2024 22:02:22 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=VsljeNAY; spf=pass (imf28.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733868153; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2Yxce1Hb0/0P5cE6q+zb1yt8qEYqdCG+5Hx3X7W7CLE=; b=mfpgIY/b7wteX0cHzsRo2vGJH0DTzBLZS7I04xCsloo3aDjXIgL613MpUBTPbfgIuViERM 6GqfKzaOAT8io+gA1Nf1fKt+eaYNNXFkVDJ8M86Cr9NQEClicjid/ijcuOhDGQa3uQKVEu aBYPBuR+HnJyDG3JIqzPF1MBTqxidy4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733868153; a=rsa-sha256; cv=none; b=sMiq3WsHiq2C+6Vw6XHUu7jaCkGSNP9ZfEOP0PsNDobjZOSwAt2tdK9YQADcp0gQDjGm/8 GVXPA55yqdlLYBH7eYDVArl0Pz6/w/ffKYfirJEbOBqwHiOn/OdMt/6RLYcEWSfGb2wBV9 dfDQi/hsejXLJ8xg7I90s06io1JA7Yw= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=VsljeNAY; spf=pass (imf28.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 93EFE20ACD6D; Tue, 10 Dec 2024 14:02:39 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 93EFE20ACD6D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868159; bh=2Yxce1Hb0/0P5cE6q+zb1yt8qEYqdCG+5Hx3X7W7CLE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=VsljeNAYadFajIAeGJ9FMKFBGspy6ozrhBqU582XvcWkNMj13LfQdRwOadXZG5Pxf Argps4EtZvFIc7JynbCTgqDrOVF3u5K7Ah2l9+nekqV0coL2L+cEZsIcBHPG5GDao7 B4HNxmwT4io4VbogtubQ+pF0xj14MXNsqvxe10Z0= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:48 +0000 Subject: [PATCH v3 17/19] ceph: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-17-ddfefd7e9f2a@linux.microsoft.com> References: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> In-Reply-To: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Roger_Pau_Mon?= =?utf-8?q?n=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Louis Peens , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0B6B2C001D X-Stat-Signature: 449ywyutcbd8yrzx564feewntjyknsr8 X-Rspam-User: X-HE-Tag: 1733868142-80121 X-HE-Meta: U2FsdGVkX18aUsd7ZdUnnopa1LbGjbzYgr+Ufyv4o//boInbqiZW+iAecgBNLDbtGFocGIJHu3CV04Df8eZliGwAR/iFRveYsjPBQZgoLb4VcVCRe2vQvnWOG2eD8pjRzIqrdmxcHzWelLaOuiwlttWCw63iErQqmR61IYrXXdVPzx+7AAV5ZZiaX5OZ7oXcxys0GqevhKN1fGAGq3tl7LSZmkr2AVczGv4vArL+QIclTbSPPTK4EWuqs3fp5P8vwleR0Iml5EsMbPdD+GdOswYBE5INngaeYPVvV8Pa0dBZgiqsLP76KbTYVwIWxEFrINlM9dSp/UvjOAmRwZu4TBWJynE3yDHzPlhM1Rn6jMd+JXU2x/wYOyrkuSbjSYDFrSQPSYfoaWnEZr1rD19y/ZWvJd4BK6w3ESrBgHeOKh4BiZC31SPoiICS3Sot1Okxck6x0sYXMaCysyt/o1qfI4jmIqjZYGI5VNDDD3QAkWCMFp798A6VCs4IIvUUu+Fse1ujF0etGBRVsuhsjeGnElOgIuvHliCVOwo84hCwASFdRcm3BMaRW2tXrtfjUmCsDVyw8PGpi5Szx38MXT7fnuCTjpepGI8AGgVwobGuS3CYE8oC+KcAng2CD09Mv3VNnFSff+RQ8DpZzTxt5poTQQIzJgEKT9Y/x8TCoU5B4iLAcUQqMM+sP754O+ECA4R+NFBoWLGx8oaMluvES9llHXzl3ynlaBqfqQd0boyd7B/TMHVqXh6nG3rrAn0IlVBXGG7zqHIYZRZplcRsXAfHUpgwdOh5KiYMYBf5OWwuDWhRp0+OBtGX5sP4LS/xDmLfX3pmg63U2gQkeQgUna5jm/Cr8Jg13Pnv0W2ibfnPiiFYWTnhJSg41wypHOZOBRXqv8FnStTWD7UmhFmfXxrJ9lqC43tJ9wgiZpA3taeJhlBnQ+xPxpX7ssqjB3EjxF4V6lbQ2pRo6XfJHvU6XVW sMm0gtUM Vj8OrBbaI+nF+f/bO2jIIGxKwn6NC46yu4Az3Adxuig/u5IhhwrykI+PqmbZOHJrcGqwupasEqoDIJQyzRkMu4Q9fKoiALJ1VCeq/yCbR/ZOCbfy54hHVnJ0gOjFlYiGsc+P31BRzWuPLzjzWsWJes7xg7ibu2dVDA0g0bi3fj33v3QYIPt/Cl9fyA5sz6iJaOgM0P/12/Pz7M5Q+shaTP1IWpuP6kK+ywPD/RneV6RZLhMhWRNgfrKw3ZDZ9ZZIi5Rx+3MjPYRw0DtiQkIy4m6lSG9xfhREHBkmfup7XEesaROCWxmBbIupDgBJvj6fwNpoHCNvMQxsn0jfR8TJmeUFvGJhSU+24Vz/++LXSHBs7ucNMTzRFRe5bQnu/cboHoeirwoX5aClH6WC+ddtim03JbSR5VELIbcTVMWWmPnYoYik= 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: Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan --- fs/ceph/quota.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ceph/quota.c b/fs/ceph/quota.c index 06ee397e0c3a6172592e62dba95cd267cfff0db1..d90eda19bcc4618f98bfed833c10a6071cf2e2ac 100644 --- a/fs/ceph/quota.c +++ b/fs/ceph/quota.c @@ -166,7 +166,7 @@ static struct inode *lookup_quotarealm_inode(struct ceph_mds_client *mdsc, if (IS_ERR(in)) { doutc(cl, "Can't lookup inode %llx (err: %ld)\n", realm->ino, PTR_ERR(in)); - qri->timeout = jiffies + msecs_to_jiffies(60 * 1000); /* XXX */ + qri->timeout = jiffies + secs_to_jiffies(60); /* XXX */ } else { qri->timeout = 0; qri->inode = in;