From patchwork Thu Nov 17 05:47:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yuezhang.Mo@sony.com" X-Patchwork-Id: 13046161 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E4A5C433FE for ; Thu, 17 Nov 2022 05:48:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239266AbiKQFs2 (ORCPT ); Thu, 17 Nov 2022 00:48:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239129AbiKQFrm (ORCPT ); Thu, 17 Nov 2022 00:47:42 -0500 Received: from mx07-001d1705.pphosted.com (mx07-001d1705.pphosted.com [185.132.183.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 158966F370; Wed, 16 Nov 2022 21:47:29 -0800 (PST) Received: from pps.filterd (m0209325.ppops.net [127.0.0.1]) by mx08-001d1705.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AH3XZBw009986; Thu, 17 Nov 2022 05:47:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sony.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=S1; bh=OP8r0h4lfQ8RDOW7N8mlx4Axv+AbuQVupQvi8Jy2mVE=; b=fwkkzGR8LJ7ZPZ6M18lRubwvTJQPUmotTioZNHk9zbRxzMxHjkigLQNMTizmDj+MxRLW 6dR572/gnPKR3vBUq8myICsLjJPMR6NP0iFE1LUUI2wGruLI8m/OeZ8bE78G8Kpdx6uv HwqL50phCRNhl8+HpBZ8YkF6JOQUOxjyWdeVTJDWwIaZab1RWJZLguE7WX4YWSagSdlE +4Qrcx+GeU/Pbz3J41u9hnWGFC8X8/SnEH6HeW9cBq4bt+sIL76Q7OSKnO+B6oMRwJYv RaJeQIjb2e7xTiTI6LpQMeIGj7iIhW2BVtudev2249fO27UCmz/laWPeNPE9JgRdBgVz hQ== Received: from apc01-psa-obe.outbound.protection.outlook.com (mail-psaapc01lp2045.outbound.protection.outlook.com [104.47.26.45]) by mx08-001d1705.pphosted.com (PPS) with ESMTPS id 3kvn8yhf2x-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Nov 2022 05:47:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E0dGGDV/d8WUVEV5Pk1r8qyPwzhVHlNa2ERsMdCwyAWcx7UQSF2CDpsKJMbk/wXOJ4laMR6WO0FHQSsJiRKHl50H6istnSR4/v2gT2olQp5S08TqqrtT4Xywhrq5bXj4QXmphzGLi8cZHOX7dA0fxTP4dJg9z4aGrp67gxdBHe5aJKlyExmYJM3N50Vx6lkNaJ/KD5g8Yz5Gs6xLvLRgBG1wpVs5lyLCOAX4xKCMQtmEIS1S/p5GJoESGrsVj75Zw61iu/T/cWWspPcF525Mo+w2ueOppm/L9iS4ZqOALXUwmqpAf3aoklWDkUMPRyMo2qgxm9Emxp1QMBQn/yupGg== 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=OP8r0h4lfQ8RDOW7N8mlx4Axv+AbuQVupQvi8Jy2mVE=; b=lNc9pbkd+VG5BKc8/aa5QmUrvu9R2EusZvQ/5XOUbOAQzPldDdfpWFcR3RLRvhB6ihd2TLcRP8YjSEUIoSxiab0aTpqBpEnDk87flKgd8n1lWDHQGOdGJVOk3RLyBEs/GigLxR/axvXuMJjPvWry+mmauCXqN4xPAK08YiqRo+ScEvBhbp/eMtRTtsePErPgQxvb6y938oeClEdATsC3zw1w0hEYCvzI3y5VRJlov6xsbwP1V4HWdgJbwDnvzaeGtI9z6FPkw/ISA+GBnGm4r8UgXPu9iJ/j1n2GDWYEcpiExsYhOefs5hmb1G/CEugfWDORyxScEJ+DgyoH1CkwXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sony.com; dmarc=pass action=none header.from=sony.com; dkim=pass header.d=sony.com; arc=none Received: from PUZPR04MB6316.apcprd04.prod.outlook.com (2603:1096:301:fc::7) by PSAPR04MB4134.apcprd04.prod.outlook.com (2603:1096:301:38::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Thu, 17 Nov 2022 05:47:14 +0000 Received: from PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222]) by PUZPR04MB6316.apcprd04.prod.outlook.com ([fe80::708b:1447:3c12:c222%7]) with mapi id 15.20.5834.007; Thu, 17 Nov 2022 05:47:14 +0000 From: "Yuezhang.Mo@sony.com" To: Namjae Jeon , Sungjong Seo CC: linux-kernel , linux-fsdevel , "Andy.Wu@sony.com" , "Wataru.Aoyama@sony.com" Subject: [PATCH v1 5/5] exfat: replace magic numbers with Macros Thread-Topic: [PATCH v1 5/5] exfat: replace magic numbers with Macros Thread-Index: Adj6RyeHIwRrcVQ8RsKCnq84QMZMWQ== Date: Thu, 17 Nov 2022 05:47:14 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PUZPR04MB6316:EE_|PSAPR04MB4134:EE_ x-ms-office365-filtering-correlation-id: e696b092-dad3-4c0d-b146-08dac85f2e24 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Re+pSLU1WNONfELGLacRQbk2cK0Sw5mLtU+3G/JNFqVttVhyKVDefbOer1/GsYWfi2b3ETg9APtxwMlSfzyyY238Du0wcCecuEfZQ+Egph7TR8a/Z/xQNPAWqVszN6oaoJBmzSrcRRY1sl/RPtX2IdFKGA3iO+qD6Ayj/yUC9zOJt//ucL8kd+7COoA0nchnnYK1PbSEyzMQ27CC1zUmH4JhtReJQIuyyGtQsy0h1EdsBXPT7fhu1kFPK0M4T7PgV/OyJwMqx5H9kjPiy56I+dFuW1+qyzfASZRfZcJcF7ISd3YDx8ynCnNDPWFC3kNSBC4JvH0m7FV0Z9CiDOG+cHdHkeuM1gQZeERy8yOHNOhzzCbc9xaba/VyUjmLSMbDoDm6Wsu0fNeqEAg6NolPAQNNlw+iG9QPP7v+Xytl4mGA0TsraHkT9DKFbZL9yMWg9I9mBZRo1YnrVwUuTXssa/RTKw4B9jGckv3ZIk5swrxIpt59rMlQ2QBtkVNNNyPKp8PZozXRs6SvOMoP4K/8dO08jFRr0GptR/YMcpYX+adaxyhy1+flPuq0vcfVV5S7ZS5ebk9Uh1oJjZcExM7ksLnqz+FFjGLYqwiDu4O46wZoPP/luVnPB2loOoS3S9X5HI6dVvwq7L5ckdeV34vNDNbWhsb+VCbtircYsBxFxHuRYWJ5PnZtQGcFUQc4iSBaft9/Kjgx0Sgsi/6/eoULQg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR04MB6316.apcprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(136003)(346002)(376002)(39860400002)(366004)(396003)(451199015)(33656002)(316002)(110136005)(186003)(38070700005)(54906003)(71200400001)(107886003)(83380400001)(6506007)(26005)(478600001)(7696005)(9686003)(2906002)(86362001)(55016003)(66476007)(66556008)(66946007)(76116006)(64756008)(66446008)(8676002)(5660300002)(4326008)(8936002)(52536014)(38100700002)(82960400001)(41300700001)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?XJfvk2XdzPied9WHpgvtd7dG3PDE?= =?utf-8?q?2wnpNiRCTEHM3qbV8Fad3OiV/xtKfxa7MrvHaAzcwb4eTK8q9CEIwftvKqYrQwY5z?= =?utf-8?q?nYjS9mLmT2w/7MvsE4r7yvUhYq6IVxlElFqseRjAZw5Jw7vNGBD5BY80lPL4fgp4/?= =?utf-8?q?SfcdSedImptpFphXMXu0pP7b4XT8hEdIGTTbxPKze+ZaP90hvATEsIVbnoT6d3XSL?= =?utf-8?q?vUoQ6qSx/+5oT/lOoMiSsakCE/7jHpQ3ldN5XNj8yBLDmwVdwY060NRQMq4Uj+MU/?= =?utf-8?q?hUT4/BgLKpV/IMLD85j5mXlrlvQITO7/9FwTYN3qytbKHZRhmOAGQQAM5zluJNVfH?= =?utf-8?q?lvVZuzidma/WsHAD/mcTqh49cHtcYi0he+aZBtwkStYyb6XthuM+gA02LLilAcR2l?= =?utf-8?q?57wM6rAOjCHG3L5UN0kRieVd5iQeN8068r9uMExp12cT9QEPXhHu6oT4YaWGWEJIK?= =?utf-8?q?07VjjTw1a045lj+QCf1Fu7Qt5UB3RlL8u81duhjPVLt5SpLzD2XKAtMfAxtaaeomM?= =?utf-8?q?5mLmwmCyL8G9WJlHqhDhgGgB76aRPkSKpN0daocXKrUI7k+JyYz/0xsD+V35nvYGx?= =?utf-8?q?jpJO6Nkm8adTu6MpNo7ByUpWhiCcHZGRNuVVnkH5lKYNiIyTsSr7R7JML18Y+awv/?= =?utf-8?q?NnNMaNZKoeksISgtrdXyLr5UtANlpeqYIlZirHRqzFAGC5MqTV2mlPzN0HTjz33tY?= =?utf-8?q?oaHEZT1uWetrffpZFRkuV8Dn5ax9WuI6WEWdfaO+XT+4z9EV/iFv2DCMKyEvnxb92?= =?utf-8?q?d6WvkQzL4CZX1yPJbYc0Yzgib3op/6Iq6LDc88L4vGat9Yw/fj9DdAVZhVmbSDnfW?= =?utf-8?q?pu4iB4tWlulbkJRA8xn4TwYXqC8ERdT9YgsGD5dn8zd2rCFGQ4CXkK0pGtwt413GM?= =?utf-8?q?otdebhmqcNRDQafLn8T2w+hxrbwNONlWR+z5Q1EwH1/3F4jUG49wRmhkM5CMvRjx5?= =?utf-8?q?9RckHPhKV2JL5OwmMEGDybMRX1NzzQIe1DaqAvL4F8SrkM0Q05N/k+2nlzT447++N?= =?utf-8?q?gwu0TTxzrjINqcjhCH4mZVy8x9n1BdlHIrhQqNYuwj2/Z16vbN+vl6iNZSBHunRc5?= =?utf-8?q?7rSGRcOiLOJ1uPnbMCVj/JXnaoycPbs+c6u53rStuBx9aOeZMcxjKWXpLUvR8xPWX?= =?utf-8?q?mO3Kar+pnEIZi8JdrjthiBY9FypViIPk41NvQAlgVld5TPoORf56hoVjNkISBfpwA?= =?utf-8?q?c5EdNekndOIYHHbvr1Lx9+cUWgxHtfdoXXjNn230kJloQxwvmbviCxfEWGVPyUOKO?= =?utf-8?q?sppjkEEcbR0J/VpRQgq9/foXT/UFBvHGyt4hR5LAYb1rqaX2vaz2lsJ7k5fX0lohj?= =?utf-8?q?t+jUI4evc63TiIPZtrYUu/f4e1100BOWq2pScft4DkKAOVYLcEpv12ECUcylkTGMn?= =?utf-8?q?VE1fozuJZoAiFl9/oLRpVs8A4Hs5JkPQnQdO9OM2lodBOGxxqF0OJnV8jomlUmS7U?= =?utf-8?q?cCy/p1EbgyP9uYYCCvn07lOo9MTtMneAr7NXQDQlytozOzvKDN7LcFET6C+CKncOV?= =?utf-8?q?/f95mSHJMIOP?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Hq7IDWwq3aA4v534gwYKwWo9liHSeRb0Xqw0IG/qub2gxWh9wMFrBRXZUIuJKKlamq/VEokEslkYjx2uAJ6qACs+XFoCoyEL0tA1rpaT5AATy+dohACBefIHkn0jH3CCnMXVY4FB9GVXaj6iCgtvgUpMMg5hXDLBVnAEWiBPEtb8v5Jq2g/S6+NHhbEoobLI8zbS/UAUVIEAbFKuk51Rc59fZGc71TXgCSmfXrEK3QgvhPrFYw3sKBr3ugNEXSmOdZdFnCzuqNNt19AvpeL8WLN4M3vaLBXpq+yC3xeIBH6qdK0ALj+AUSzksTmulgbB2gRNKwXIc6VTFvUFY0rgW3Lr+Gr0dWTn2OPBm6ZqZgbcHKmxYevIjGN9NaCi4BHlGGMBPiIDnlWc+jxvtP/TG1P/CCtWyoCm50TZ0I+TCReZgMZAd6lumnu2WTXGzDXFc8WYG/n2xeyYJz2TCbbBOC94uAdnbmDF0zEOj5ez5tM8VCJKa1m7EIo6niwIygt2NAHHROXGabVXlm3qLhuBJ6ConoGcfhAy9HSHr51nszjKcGiEJ1xJgI8oVKTNNfSFsFt0k+95u9xGOYToRD1/IYoP0I+RqmhWNqGZG38sZxXsFuJqYOkEYNQPCxn/j+okImFv43vVSqc8WWgvslF/qN/d+uHRwkKNiFjU+h+EbHYgDHArkGQ1/jcDeHrPF090qkLzQyUwo51HMRLXSgRz98kINcKaDRLbHiSIeC92R2VIJW+jfGrmPNsBQ3l1YUzCNS7/MGEn7ex24q1TToaXX/IZZz2SPFPxQYnHbZtJqCtfyd9Od5I1sCdblxA8dmdA18qZCgs8QbTs8+cgyhq+Gn8+tx0Y9N2oh+0aSVwvKjkwozgQQ/bzyTeXyoYL/zyL X-OriginatorOrg: sony.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PUZPR04MB6316.apcprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e696b092-dad3-4c0d-b146-08dac85f2e24 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Nov 2022 05:47:14.7795 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 66c65d8a-9158-4521-a2d8-664963db48e4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: LV4lbI4L8Szq/DbcwvBGx/D/DV9l8YgWYlV9MJQBFuS1+HH+4EnDxc9uBsDnCElWNfq3wbwlpqF6HpOnld2kVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR04MB4134 X-Proofpoint-ORIG-GUID: lU3S9UJPozDUj2iFYFXArBKd4b0Di_UB X-Proofpoint-GUID: lU3S9UJPozDUj2iFYFXArBKd4b0Di_UB X-Sony-Outbound-GUID: lU3S9UJPozDUj2iFYFXArBKd4b0Di_UB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-17_02,2022-11-16_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Code refinement, no functional changes. Signed-off-by: Yuezhang Mo Reviewed-by: Andy Wu Reviewed-by: Aoyama Wataru --- fs/exfat/dir.c | 10 +++++----- fs/exfat/inode.c | 4 ++-- fs/exfat/namei.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/exfat/dir.c b/fs/exfat/dir.c index a9a0b3e46af2..f50c46ccd0d0 100644 --- a/fs/exfat/dir.c +++ b/fs/exfat/dir.c @@ -44,7 +44,7 @@ static void exfat_get_uniname_from_ext_entry(struct super_block *sb, * Third entry : first file-name entry * So, the index of first file-name dentry should start from 2. */ - for (i = 2; i < es.num_entries; i++) { + for (i = ES_FIRST_FILENAME_ENTRY; i < es.num_entries; i++) { struct exfat_dentry *ep = exfat_get_dentry_cached(&es, i); /* end of name entry */ @@ -591,13 +591,13 @@ void exfat_update_dir_chksum_with_entry_set(struct exfat_entry_set_cache *es) unsigned short chksum = 0; struct exfat_dentry *ep; - for (i = 0; i < es->num_entries; i++) { + for (i = ES_FILE_ENTRY; i < es->num_entries; i++) { ep = exfat_get_dentry_cached(es, i); chksum = exfat_calc_chksum16(ep, DENTRY_SIZE, chksum, chksum_type); chksum_type = CS_DEFAULT; } - ep = exfat_get_dentry_cached(es, 0); + ep = exfat_get_dentry_cached(es, ES_FILE_ENTRY); ep->dentry.file.checksum = cpu_to_le16(chksum); es->modified = true; } @@ -858,7 +858,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, return -EIO; es->bh[es->num_bh++] = bh; - ep = exfat_get_dentry_cached(es, 0); + ep = exfat_get_dentry_cached(es, ES_FILE_ENTRY); if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode)) goto put_es; @@ -895,7 +895,7 @@ int exfat_get_dentry_set(struct exfat_entry_set_cache *es, } /* validate cached dentries */ - for (i = 1; i < num_entries; i++) { + for (i = ES_STREAM_ENTRY; i < num_entries; i++) { ep = exfat_get_dentry_cached(es, i); if (!exfat_validate_entry(exfat_get_entry_type(ep), &mode)) goto put_es; diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c index a84eae72556d..62f1c7bfb5d1 100644 --- a/fs/exfat/inode.c +++ b/fs/exfat/inode.c @@ -44,8 +44,8 @@ int __exfat_write_inode(struct inode *inode, int sync) /* get the directory entry of given file or directory */ if (exfat_get_dentry_set(&es, sb, &(ei->dir), ei->entry, ES_ALL_ENTRIES)) return -EIO; - ep = exfat_get_dentry_cached(&es, 0); - ep2 = exfat_get_dentry_cached(&es, 1); + ep = exfat_get_dentry_cached(&es, ES_FILE_ENTRY); + ep2 = exfat_get_dentry_cached(&es, ES_STREAM_ENTRY); ep->dentry.file.attr = cpu_to_le16(exfat_make_attr(inode)); diff --git a/fs/exfat/namei.c b/fs/exfat/namei.c index 57510d7f58cf..38ad31b7eef2 100644 --- a/fs/exfat/namei.c +++ b/fs/exfat/namei.c @@ -646,8 +646,8 @@ static int exfat_find(struct inode *dir, struct qstr *qname, dentry = hint_opt.eidx; if (exfat_get_dentry_set(&es, sb, &cdir, dentry, ES_2_ENTRIES)) return -EIO; - ep = exfat_get_dentry_cached(&es, 0); - ep2 = exfat_get_dentry_cached(&es, 1); + ep = exfat_get_dentry_cached(&es, ES_FILE_ENTRY); + ep2 = exfat_get_dentry_cached(&es, ES_STREAM_ENTRY); info->type = exfat_get_entry_type(ep); info->attr = le16_to_cpu(ep->dentry.file.attr);