From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96D6AC41514 for ; Sun, 1 Sep 2019 05:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69F2322CF7 for ; Sun, 1 Sep 2019 05:53:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=aol.com header.i=@aol.com header.b="eJtOhTE8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727157AbfIAFxU (ORCPT ); Sun, 1 Sep 2019 01:53:20 -0400 Received: from sonic305-19.consmr.mail.gq1.yahoo.com ([98.137.64.82]:42097 "EHLO sonic305-19.consmr.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725263AbfIAFxT (ORCPT ); Sun, 1 Sep 2019 01:53:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1567317198; bh=SEiscPC1v1LfR84rbvNY+J8YVEUu/TB5z/fYe1mNmJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=eJtOhTE8s39SZItn8ZXe6OEY1dUisdRMcWOeilpJUjeD0FmEr/0CWeDzUG6ihLCmK5+sT2IzyeaLnLctNIzTJgo14J0hkoeIdxLXkJpnI162p95SIatrRFDcn/3nIC1ygogG76CPVaWnXjP2xi4ZvxcqVeq8GwWi4kavrz1hJ6nCgRRft30vSP4zDlHDlHM7hkKFVLRqY+QCqx3X9wp127TVFkw81eOsJIc4lLMyFIYeYkNlSgQdsj9vysW8KfkOxW/g3Fpf49pPu/Icb197l4Fkr7/7OTUfL/LOvvumxzpkdlm7ZgCnUgz/xE0BQ2wDOL3ol9KSQtpy3L7I76GfwA== X-YMail-OSG: ur40BOsVM1l6xEudGp5R0BcAxKwdyW_h2voKsZguKUu2EyU8n6J7ZYc8aYEsVQC cDIWxG0yi0Off1UZeh6cSDRgFFkOPcVM4VhBrnRGSYDHAzGIF1pGw22PB_RrZrVabnHLkDq.ZnEV rHBTuhGidsQwx.yPFXCNzN_aByfO3yep6e.nyx0ZnYb8LlZWJWKnOLwL6NrmNbgKDhjJiODINO.1 IJu_E82if6OGFf2HOFnbbNdXxXw6dXqZXAEQX0afZLepgC7iwC9O8nqJopkiKprfDq7A2WaQTGzI wCjLjrnc8Ke0dOxUqkYe7ZkBbSijTtfwlTVwNPP0FFNvlJBkfTI4UX1bB8I4KjfMLctxK7zQsUT0 FaqfEI0bGYIKgAhy0bf0lezkf_VxeIbDUp9IrO12G_IVH82gmZg8dx08pIddieaNOcRz0buNvT4M hAvYQ7TTDdft.o4yVnajhvmi2FFDhpd8PHTLg0eeggK9hyMIlQdbd5Lb_3z.X0vEQ.F48hfkC1zw CrALt8mVait_zAX40SqDse9C4XhzynmBxHA9pzyudjvFPLvxrr6.u8N3W5zKXrvRCGwP35BWGfVa 4gKcqy7tcMxnFEc1RP4BO5_DQYzi0C7JrF0PQcbom57qvnctt_53prS6FWqTE2eEMo1SRKMHA4bK gvyIIZjMu56awnMdz_rObZJrBpuvI5SYXkS3AWFB1iJUgNHgt8jpwm3UQG2BzS2rYjjJxKIYcDvs 4NTTKdjmd1XtYviPytzRklpH9hNgM0ojrg2w2RUQxvBN.txljGm9.a04XHPG770gEk8oboUJ4266 ZD67Gz5JBLTkjKOWu9eYxmqq6E3LIBfpkNKhWiLd0A2.t5zxONDn2ddny3fIL9qSG0up_kRXZGtD z6Jg9ljijbUuDj2bk4zWfoUCVMNs.zXySLqwlhNmXtJrkCgap2ePDRQeBrRLBvTl11wUwd.09Ew8 dfu6l.suG124TCNguc3QY7pyK_rcoztluPJKsvwnLVqPVrJSzeXa2zqWX6.Itb54c8JkuHN3jWaj fjNr89QqQy7XlPnFiI6yWLmkWBZzEfEpC_gJD9RL11glV3uv67ipRXG8dtAwpPL8vFlkb3iESmPm oxZ5vOxuv7S2IDkW1_xuVxw6aTSVXf6J2R4T5QDz_FBsU.TnE.lqF2OM1tXyYT9VXeHXWntHF1H_ V_7MIskRkrsScNjNrRES_n49intgudd9wovqDy1h42jgLmlXVZl0NB7rmUV6FXDqJq8nYcPAXqI1 V.5symirtkQqLDzBL6djeg46q3qlnF_VjeUmwiTe.5.1mnMcy6A-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Sun, 1 Sep 2019 05:53:18 +0000 Received: by smtp406.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 426e3b5ec1af9e36f409445c51071a70; Sun, 01 Sep 2019 05:53:14 +0000 (UTC) From: Gao Xiang To: Christoph Hellwig , Chao Yu , Greg Kroah-Hartman Cc: linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org, linux-erofs@lists.ozlabs.org, Chao Yu , Gao Xiang Subject: [PATCH 17/21] erofs: use a switch statement when dealing with the file modes Date: Sun, 1 Sep 2019 13:51:26 +0800 Message-Id: <20190901055130.30572-18-hsiangkao@aol.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190901055130.30572-1-hsiangkao@aol.com> References: <20190802125347.166018-1-gaoxiang25@huawei.com> <20190901055130.30572-1-hsiangkao@aol.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Gao Xiang As Christoph suggested [1], " Please use a switch statement when dealing with the file modes to make everything easier to read." [1] https://lore.kernel.org/r/20190829102503.GF20598@infradead.org/ Reported-by: Christoph Hellwig Signed-off-by: Gao Xiang --- fs/erofs/inode.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 2ca4eda6e5bf..6e2486cc3cd4 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -32,17 +32,24 @@ static int read_inode(struct inode *inode, void *data) vi->xattr_isize = erofs_xattr_ibody_size(v2->i_xattr_icount); inode->i_mode = le16_to_cpu(v2->i_mode); - if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || - S_ISLNK(inode->i_mode)) + switch (inode->i_mode & S_IFMT) { + case S_IFREG: + case S_IFDIR: + case S_IFLNK: vi->raw_blkaddr = le32_to_cpu(v2->i_u.raw_blkaddr); - else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) + break; + case S_IFCHR: + case S_IFBLK: inode->i_rdev = new_decode_dev(le32_to_cpu(v2->i_u.rdev)); - else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) + break; + case S_IFIFO: + case S_IFSOCK: inode->i_rdev = 0; - else + break; + default: goto bogusimode; - + } i_uid_write(inode, le32_to_cpu(v2->i_uid)); i_gid_write(inode, le32_to_cpu(v2->i_gid)); set_nlink(inode, le32_to_cpu(v2->i_nlink)); @@ -65,17 +72,24 @@ static int read_inode(struct inode *inode, void *data) vi->xattr_isize = erofs_xattr_ibody_size(v1->i_xattr_icount); inode->i_mode = le16_to_cpu(v1->i_mode); - if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || - S_ISLNK(inode->i_mode)) + switch (inode->i_mode & S_IFMT) { + case S_IFREG: + case S_IFDIR: + case S_IFLNK: vi->raw_blkaddr = le32_to_cpu(v1->i_u.raw_blkaddr); - else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) + break; + case S_IFCHR: + case S_IFBLK: inode->i_rdev = new_decode_dev(le32_to_cpu(v1->i_u.rdev)); - else if (S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) + break; + case S_IFIFO: + case S_IFSOCK: inode->i_rdev = 0; - else + break; + default: goto bogusimode; - + } i_uid_write(inode, le16_to_cpu(v1->i_uid)); i_gid_write(inode, le16_to_cpu(v1->i_gid)); set_nlink(inode, le16_to_cpu(v1->i_nlink)); -- 2.17.1