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=-7.4 required=3.0 tests=DATE_IN_PAST_06_12, DKIMWL_WL_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT 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 A5636C282F6 for ; Mon, 21 Jan 2019 08:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7525A2084A for ; Mon, 21 Jan 2019 08:24:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=philpotter-co-uk.20150623.gappssmtp.com header.i=@philpotter-co-uk.20150623.gappssmtp.com header.b="2FOnpuqa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728836AbfAUIY1 (ORCPT ); Mon, 21 Jan 2019 03:24:27 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44778 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728490AbfAUIY1 (ORCPT ); Mon, 21 Jan 2019 03:24:27 -0500 Received: by mail-wr1-f67.google.com with SMTP id z5so22132626wrt.11 for ; Mon, 21 Jan 2019 00:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philpotter-co-uk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=LqTYggp/cqR/1TeCbGSCMnIPLbgTYb3scF6iefUCBrc=; b=2FOnpuqa/6dWjy9ztAAcmwNeWi3JpjvKy0r8N9tBq/uxfHEChVsNVW13OQ9n0nYkKF 1qWsG3QV8LFRq+sQN4CSKSKcEwVDVWY4Jhri/XU1rtFI7eBIBQa0nUBWWwrhGWPutVOI QvnktNG61rxyffJGD/fSCuXKkqRzwGCIKsyuF+kc2AgvL0xKK6XmwQyup1/cD5oxXiFK kOjpVUIALwh78BLmBiSCHcrCGqdjsEv2snyL+vqw8pHWXFXErPZdB7yjKuoR1Vs4mDfs jpszkHlBMEEb+IIMbTsOaBfl+ih7HccmUi0Eq2OskEij6ljFOsMuEaOaUS2s/S578baX /uXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=LqTYggp/cqR/1TeCbGSCMnIPLbgTYb3scF6iefUCBrc=; b=T2E6CLFMH6YEzvxarEBpIl7qw0Ruooe/B7BQNucJ3iX5zGbJrkHUAk+p/Lqf2sxbbN Vq95y8UuiUbK3tKIQ7d2F9SrsjEu9mvsu74s1QxqkwgeGBdebgCnvtzGN1xFx3DFaJkx iHeNvT4Brs8s4qhn5ymwsH4gOIgJro05oxk4nqHS2pq/jsh+k5HKXP1pXbnOUE7YLPxr 40sER0JVrimOZKtExJ1XnaYMG/bFaMapMHP/kOp/Mh1Qs0tb8aehOUyBp9xg1KjQaEh5 TnvPij5+DDoJyVQ13FBgvsiC+S78Ukq4P2N2qfzLS3xPGUT5PCkxbXyAZ5rjzy3LUDOf ZnZg== X-Gm-Message-State: AJcUukfSEBu7428wKSt3RfPDx65LNbdc8h0PTnQSUC8qlHOahe4Q7oUP ZgcBKdnVT+6U01btkFkLvl/rn/r2nPrmzA== X-Google-Smtp-Source: ALg8bN7/Egb68GoYTj5sjuDy6MNBvN1Sf/CL8a77VyfyfOwuxRY2fPtzOXnPiQlnAu6Fhw4r0GzK8Q== X-Received: by 2002:adf:f009:: with SMTP id j9mr25191349wro.170.1548032071417; Sun, 20 Jan 2019 16:54:31 -0800 (PST) Received: from pathfinder ([90.222.17.17]) by smtp.gmail.com with ESMTPSA id n5sm89967010wrr.94.2019.01.20.16.54.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 20 Jan 2019 16:54:30 -0800 (PST) Date: Mon, 21 Jan 2019 00:54:30 +0000 From: Phillip Potter To: linux-fsdevel@vger.kernel.org Cc: amir73il@gmail.com, viro@zeniv.linux.org.uk, slava@dubeyko.com Subject: [RFC][PATCH v5 03/09] hfsplus: use fs_umode_to_dtype() helper Message-ID: <20190121005430.GA32336@pathfinder> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Replace if/else statements with common lookup table implementation - file systems that use the same file types as defined by POSIX do not need to define their own versions and can use the common helper functions decared in fs_types.h and implemented in fs_types.c Reviewed-by: Vyacheslav Dubeyko Signed-off-by: Amir Goldstein Signed-off-by: Phillip Potter Reviewed-by: Jan Kara --- 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 29a9dcfbe81f..c61a4faec2ae 100644 --- a/fs/hfsplus/dir.c +++ b/fs/hfsplus/dir.c @@ -223,7 +223,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"); @@ -232,21 +231,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"); -- 2.20.1