From patchwork Mon Dec 19 20:11:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 9480711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C348601C0 for ; Mon, 19 Dec 2016 20:11:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A30A28471 for ; Mon, 19 Dec 2016 20:11:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E88A284E1; Mon, 19 Dec 2016 20:11:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1310728471 for ; Mon, 19 Dec 2016 20:11:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754004AbcLSULk (ORCPT ); Mon, 19 Dec 2016 15:11:40 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34580 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbcLSULi (ORCPT ); Mon, 19 Dec 2016 15:11:38 -0500 Received: by mail-wm0-f66.google.com with SMTP id g23so20630982wme.1 for ; Mon, 19 Dec 2016 12:11:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5FmKUe3gL6o36LsV9IPE7ZV2GZmGg5vMA6/Qp0hq36Y=; b=SLQM7IXwLKKOiKxgoeZv5i5RoINJuftx/eDgYlIGoScWZrby0NCEC9JU69EYhYpKsj metBjRrvew13TbMW9CzCiIZNND6IPqkL+DDlYtYcZkShyHDBjcCtyOuLgh92z07cfSsU 4AtDLJqrydovIKJmmy0B0Y2I7MJwaEg9C8jMcp4vR7uERsi/FT8rw3/xptyyfaqN8Ewn S7Gw6VqB9oRE8WZOZK4SUeGWaRYQaBDsCf/9zY9chd7LzWA73fcnj2wTDJkxFA8uk4s0 HwGOo/FwRnqs3PrhmiCqFqIvvvTjzAMmfv3Xsu0X6i/zwtsmQJniA80Yjm1JVBW4g/FD FifA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5FmKUe3gL6o36LsV9IPE7ZV2GZmGg5vMA6/Qp0hq36Y=; b=RrU7j+fN8IeuK4gBPjmQ3n/DPKe3nXo96uTQQvEngG5b5Mi4hvWLuys0UrC7Al5Iaz sIE8bxdCpixaaZlCwzyWnAbsB1DUd5UiedKeEivyV4q4pSi4IbjKb+lHhVW159m3oSqa nw+gJG9LLhVKLLy7/3+hYgsUoAc9gcpFGlqR7x/i3ToK+MHaawkDI9HXu5KUMl5ConbO USGEU/74BUK7R7THsFndsHV56pwKxvCZ14gJE2aSVAkBUaZJpG/AHcndhCaq1YWRnF5R +cbpRJ+kutHLDsy/TvvSePqgtjhiSquim67Fhfb7LDFrqVn3R99r/u3KQwEg2seNZ/j0 zrMA== X-Gm-Message-State: AIkVDXIn3D1mANy3YmNA049HisjPVq/b3VaePkBRE7rGZWJBazUaL8jMpG5pwHDu0uxyHA== X-Received: by 10.28.36.87 with SMTP id k84mr15884305wmk.64.1482178297072; Mon, 19 Dec 2016 12:11:37 -0800 (PST) Received: from amir-VirtualBox.Home (bzq-79-180-107-203.red.bezeqint.net. [79.180.107.203]) by smtp.gmail.com with ESMTPSA id c81sm18651933wmf.22.2016.12.19.12.11.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Dec 2016 12:11:36 -0800 (PST) From: Amir Goldstein To: Jan Kara , Theodore Ts'o , Dave Chinner Cc: "Darrick J . Wong" , Chris Mason , Boaz Harrosh , Jaegeuk Kim , Ryusuke Konishi , Mark Fasheh , Evgeniy Dushistov , Miklos Szeredi , Al Viro , linux-fsdevel@vger.kernel.org Subject: [RFC][PATCH 03/11] hfsplus: use fs_umode_to_dtype() helper Date: Mon, 19 Dec 2016 22:11:00 +0200 Message-Id: <1482178268-22883-4-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482178268-22883-1-git-send-email-amir73il@gmail.com> References: <1482178268-22883-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP replace if/else statements with common lookup table implementation. Signed-off-by: Amir Goldstein --- fs/hfsplus/dir.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c index 31d5e3f..edf60c7 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -224,7 +224,6 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx) break; } else if (type == HFSPLUS_FILE) { u16 mode; - unsigned type = DT_UNKNOWN; if (fd.entrylength < sizeof(struct hfsplus_cat_file)) { pr_err("small file entry\n"); @@ -233,21 +232,10 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx) } mode = be16_to_cpu(entry.file.permissions.mode); - if (S_ISREG(mode)) - type = DT_REG; - else if (S_ISLNK(mode)) - type = DT_LNK; - else if (S_ISFIFO(mode)) - type = DT_FIFO; - else if (S_ISCHR(mode)) - type = DT_CHR; - else if (S_ISBLK(mode)) - type = DT_BLK; - else if (S_ISSOCK(mode)) - type = DT_SOCK; if (!dir_emit(ctx, strbuf, len, - be32_to_cpu(entry.file.id), type)) + be32_to_cpu(entry.file.id), + fs_umode_to_dtype(mode))) break; } else { pr_err("bad catalog entry type\n");