From nobody Fri May 17 10:34:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=vivo.com ARC-Seal: i=1; a=rsa-sha256; t=1688635098; cv=none; d=zohomail.com; s=zohoarc; b=UhFjFm5swz9sDbrtC0tb6d6z8Wovgr+0Qj7JmBJacr+KghLPooKy/vDK93GUvY4aSRVX5VKdCtBemEzgvDYiMd+KHthN72JsRs96bwHaycnhJ1AXfH/CBCPEw/3rwIfCi7JDxZegCPSi4E3qxO2e4x2h+Gptt4HFPChqxozKWes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688635098; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=TC40/Mk4pipYtQMPyX5G7aM5k75xPSo9LeZORXXwFLM=; b=KDOgl+UOVEp7S7Sc6h2q/b0Sb7cj4uuFuG0PDKleg2V6ScROwzdMCXm8+NNFs2J2jzpcEdx6TWltM0DsebzT8pNnLrjIz2hHHfXzwDSbbmx7PHRhVZT+VMPknzMZdDXcCSIv8etQ30mjXXmndijPHi51mLI20ymZjp+yQFo0bbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1688635098304292.3206942978138; Thu, 6 Jul 2023 02:18:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.559815.875155 (Exim 4.92) (envelope-from ) id 1qHL7W-00060r-DH; Thu, 06 Jul 2023 09:17:50 +0000 Received: by outflank-mailman (output) from mailman id 559815.875155; Thu, 06 Jul 2023 09:17:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHL7W-00060k-AY; Thu, 06 Jul 2023 09:17:50 +0000 Received: by outflank-mailman (input) for mailman id 559815; Thu, 06 Jul 2023 09:16:31 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qHL6F-0005zS-Cv for xen-devel@lists.xenproject.org; Thu, 06 Jul 2023 09:16:31 +0000 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2072e.outbound.protection.outlook.com [2a01:111:f400:feae::72e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c9d1adff-1bdd-11ee-b237-6b7b168915f2; Thu, 06 Jul 2023 11:16:30 +0200 (CEST) Received: from TY0PR06MB5706.apcprd06.prod.outlook.com (2603:1096:400:272::6) by SEZPR06MB6644.apcprd06.prod.outlook.com (2603:1096:101:181::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.17; Thu, 6 Jul 2023 09:16:22 +0000 Received: from TY0PR06MB5706.apcprd06.prod.outlook.com ([fe80::d6ff:1295:38d7:a019]) by TY0PR06MB5706.apcprd06.prod.outlook.com ([fe80::d6ff:1295:38d7:a019%7]) with mapi id 15.20.6565.016; Thu, 6 Jul 2023 09:16:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c9d1adff-1bdd-11ee-b237-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KQg2l9U3FZwPKer7Tr+6BMCuTknxh2PaVDmRl8/b9Q+CsGtfwF77PvlNRXwEmxlcyjVeveog9TWikvpunioNL+zXR+/l3VCTRqDkyTu+vzpigX/K17SQ86vC/hPvoa8zgW1IXr5zMVJKl08hiA8NdsGAsyHKpgqu7Io+WcrGuGyzgtOOrgtTNpAwQV+Mujd/wJZanOZ1eK41+JSRGQEC2LdarR6egO7aZ9ki9cN79dgo+iuh769Kg5bHF5u5aCqLOnKeg+z8pARwSZWmwXki+7+HP57/cTviqNKC7Lp807Bv48V1aOsEyLEIeDVOu4dkJyM0c49UmXlF9I3rD84J7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TC40/Mk4pipYtQMPyX5G7aM5k75xPSo9LeZORXXwFLM=; b=iVZwERdTueaVUWkcP/g3KSptDC8Nl76uoVohYGMYG4e3XZXekd3GKCyX9urPrW2NFQuhiKhOYOW2er+gV7aRY7Xhwrf8Q4xnk9vK9V4f8m2uR90sauZgqxZrx7K9GaitTSK1oVbQCyrkTbUB1gH6vJfXg4i09VyCBBEPgeTV/r7HP4P5XWd/Q9ZBeSbbhL6/o8JAMkN/btjPbWJFv8WPM+UASn3/tH7s4tN5kXcCmnCzy4OYop0QE+NySQR+gnhy+wELHh337llEHpTe5EayjGh24Bel1B6J3P6qhIAK90cIJVaya1asys9O/veIILJ963/tVl14ZV0yIO3RbaOLjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TC40/Mk4pipYtQMPyX5G7aM5k75xPSo9LeZORXXwFLM=; b=YPpV2D6Kzr1+ckGZxDnqD1v8CRhzKqmxD5VhufI0tByx6qBGjR/bghcaCHdi/QAgsOOW0K0QIJ7i5q82ef2SwiKRYm9X8J61LGdHHDN1cJgJ4AUtGkiqcBh+sm2B175NribjWTzNlFwIxneNETyd+uw5+hjVr1INj/5Enb1+w8s35JAXyKFm7W2vZK1ENa/YajSb/JHqiFmOy85DDEVq9uvKDPg+nvz3kcUoHcNxQwHNhsV4rbc0OxKhaDly3JVVpRM9EfmAWeRFp1uzb1tEPnf95AmK/IJXURj9MO1Ia9PXcOY/Qd66XEjCHAITPunLsY91P5knapZEL3EC3ttsKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; From: Zehao Zhang To: roger.pau@citrix.com, axboe@kernel.dk Cc: xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Zehao Zhang Subject: [PATCH] xen/blkback: Convert to use time_after_eq macro Date: Thu, 6 Jul 2023 17:16:13 +0800 Message-Id: <20230706091613.40136-1-zhangzehao@vivo.com> X-Mailer: git-send-email 2.35.3 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0015.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:26c::19) To TY0PR06MB5706.apcprd06.prod.outlook.com (2603:1096:400:272::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY0PR06MB5706:EE_|SEZPR06MB6644:EE_ X-MS-Office365-Filtering-Correlation-Id: 0cfb6c15-44c5-496d-0214-08db7e01aa79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qob8ffNRD+wzU20BEmolrHKDTaimOfoJRM/Ktyh8gfiiOjn545q71M632RsMINJIi1GRuRud+zbKeT21h2LyV8p21bVRVcy6u+0DYx8fT4DBW1U4XOPYmh+uUKnCvMlwiHCfn1kvP38obepKYq3Xvse/qIyhjl+ODFmd9QkcxMjPpzzXClcbdBNnxPbhCEGQe4SxeIa7r9LlqqGBc/JFi5WOYsAgVjKbQaTv2QDyt1XO3ovkRvpcB3hk1y2ZG4lF44FsUrLIZrDvu4AK7ldNq1nOotheToVwX/aGqZHGioOIvVUlJtyTRRSOUaKj8ezNkAG3p3MGvGlLxeoVf1mPoM1O8jb0gBN1HozmAtHYCGqKENs7UPc2SZz4TNHxESoAxZySwOY1K36hqup31gqt1VtCfxQrf2nFecpLMIHFH6b8kgIviBRj6McTDNMElqc0NXbtwd/1Z5gASkIGH0uLTxAuiX7mjN7j9hPZ/aQlTPEFVMGPNadBZjnSclPqluJrlXUW/AxkTc1T+l3opjNQ7+IsSD+Usorw8gK7zEIBT9isJK2eBI37CWv0nK+hax8aoU+wWzzq4mNsEQNPEBY8Np2NReCBEL3GjTb9hf1t3tcJrmAMmj3jpd83HYsrvt0g X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY0PR06MB5706.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(39860400002)(376002)(366004)(346002)(136003)(451199021)(2906002)(5660300002)(2616005)(86362001)(66556008)(66946007)(8676002)(8936002)(6506007)(6486002)(6666004)(26005)(1076003)(478600001)(52116002)(107886003)(186003)(6512007)(38100700002)(38350700002)(83380400001)(66476007)(4326008)(316002)(36756003)(41300700001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cxLkbjFMD31cFBSS80uSjWUy1fz8HLX+CTquCDBX4zzdb9wHOwUInrMXAzBy?= =?us-ascii?Q?Vp0lRKEZE9MYYDLsjNPoQCQkBGI8jwx6G7ZojQeFMGjs5QN1AvIPEezZAPrn?= =?us-ascii?Q?GEr15q6r/zz8qGJleOBeABX9vfRWh0N7oTl+IKOvx40Ei2axN2qkQHzJ6vte?= =?us-ascii?Q?zEWzwcWkMMV6uiDFTm4IdwAsBbcSb06iToI53B9tF82wk56r0tD3GddFRcWV?= =?us-ascii?Q?oHhZzYhJeTZnj6wYC+4AS1VCdzTI9RgIz46BscmgIUNp/XqObVOw9BSQgc4A?= =?us-ascii?Q?TxnLmqO1T8HwuC5Z8yOo5EPTonI5Vws+A9ecrE/4gmw+rhqJIOWY+ns+IrY5?= =?us-ascii?Q?F65hRCD1e+oT3xflkX7m8ypvTzTIW+SzvbxGMmKx9OD3wPqWKQYMeZ925MZZ?= =?us-ascii?Q?aBYNkW0BDL7jjVsT8Fvsm+PWnuUadEfzCOGP1qzB4np/QmjQO+UVZ2comdXx?= =?us-ascii?Q?oJ3rblqGv9XvbHx9d+DM4TuIHrIh9HjcE/q60HYrPTEbwoLxJfhnXxs/kaCc?= =?us-ascii?Q?/IK56aeF61nccJ64AP8lJgdJe5Pc/rd9xqcwGMk7xQD0qxJ57anz8mw5HYFf?= =?us-ascii?Q?BsKdiHcBeeW0Uin7dSamQ3X5O6NmblvQT/Hdg0jJyj3nYC7HB6J7j1ARZMMh?= =?us-ascii?Q?bWu2p96KcY2H8BD/nAXZEFhkKMdlsv9w2pgAL40y3b4QkupFfM5KcVXP05/B?= =?us-ascii?Q?0qHYKv16kc43dHtWHMZF/F+Hjt70AonNyaUiRo9fgOUlbNgsq9Twx223D2jd?= =?us-ascii?Q?3/xeglGMB5z1fSk3gxTYl80Q01c0J/c8t75qibbCi9h9LSTcypUM3sq5n4/L?= =?us-ascii?Q?AVDHto04YT3FQPhxXCGWZ+Ul4BUEg3wSnKjcKNIqs2M3amBQHV92EQr6PCA1?= =?us-ascii?Q?X5iy6FiSTmi1Y0KE+RReHhQnyXSZw3RFLSWOcWJtjy2SuiESGPQDgP6PknXI?= =?us-ascii?Q?8u9JeoA+KbTy+NcT+hsrr+cCIVDl2G0QFABhVKXFvaoMuOw/y/6YuLoWzHKB?= =?us-ascii?Q?KYMg4ERUMgrEiQqx/+h6qTMmI80A+5+myXvfgPaSZJy5/X5nkpgPzUAqPVAr?= =?us-ascii?Q?U0yAQGdikZxzgwz+L3pIBlBrrzlKxB9FB8/gGm6iwBemVy/UYEySfpTvmArd?= =?us-ascii?Q?0n7u9B3nR9ZJTgzRDur3e7QkM78C5H2b6JV3C5oPeAdmpxgJpmyN5Ao8G8+g?= =?us-ascii?Q?2q1yposGeJcoOk8Av6KE5WDAVqi4EEH6GLlcY+dBZTwYv82mo4NANTOhzSFq?= =?us-ascii?Q?4sqLnTuLHNUQlgiHW+OyYhL4fbomXOEhHdAyFkkrnPsDgxQ1qJqSvDri8osq?= =?us-ascii?Q?u69QyKb/M4tKsJcvfmP/gFnbTWfFZNIHK2X93+hcyqz5pvuV/a6Rj+tg5AOH?= =?us-ascii?Q?LxkuiIYDEE7EwDGruhmKcvohpQRjM3kuxZVGtL5ekOMPU70hIabt8+Jn7bLZ?= =?us-ascii?Q?gJp2oWSk1hh0ltPpe5w3DYeqsWJ+ZhNsScbgx5rHhCrs8gCbq/92L/wnwvaQ?= =?us-ascii?Q?mdqi3R+0G3QgAuIs32ngLViv8abOjVhnJQuqIb9E4jJ7TcaOqZUfM3xWrTE0?= =?us-ascii?Q?Og9RO5567X8/Geif6jGSz95O/83EKkuERxFS4MYt?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0cfb6c15-44c5-496d-0214-08db7e01aa79 X-MS-Exchange-CrossTenant-AuthSource: TY0PR06MB5706.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 09:16:22.7995 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8VOZVjM2kgNNbV09fogH6VvaM81sWFIbx7bxCXQT+r3yDYZMBdO6tBF4evhKmWHHdb8PYXd4I3v9yzhSXyhyEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR06MB6644 X-ZohoMail-DKIM: pass (identity @vivo.com) X-ZM-MESSAGEID: 1688635099658100001 Content-Type: text/plain; charset="utf-8" Use time_after_eq macro instead of opening it for readability. Signed-off-by: Zehao Zhang --- drivers/block/xen-blkback/blkback.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkbac= k/blkback.c index c362f4ad80ab..77b1b1785eb3 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -42,6 +42,7 @@ #include #include #include +#include =20 #include #include @@ -134,8 +135,8 @@ module_param(log_stats, int, 0644); =20 static inline bool persistent_gnt_timeout(struct persistent_gnt *persisten= t_gnt) { - return pgrant_timeout && (jiffies - persistent_gnt->last_used >=3D - HZ * pgrant_timeout); + return pgrant_timeout && (time_after_eq(jiffies, + persistent_gnt->last_used + HZ * pgrant_timeout)); } =20 #define vaddr(page) ((unsigned long)pfn_to_kaddr(page_to_pfn(page))) --=20 2.35.3