From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-f193.google.com ([209.85.214.193]:45435 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbeJXHIP (ORCPT ); Wed, 24 Oct 2018 03:08:15 -0400 Received: by mail-pl1-f193.google.com with SMTP id o19-v6so1286424pll.12 for ; Tue, 23 Oct 2018 15:42:50 -0700 (PDT) Message-ID: <1540334555.28908.1.camel@slavad-ubuntu-14.04> Subject: Re: [RFC][PATCH 03/10] hfsplus: use fs_umode_to_dtype() helper From: Viacheslav Dubeyko To: Phillip Potter Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, amir73il@gmail.com, viro@zeniv.linux.org.uk Date: Tue, 23 Oct 2018 15:42:35 -0700 In-Reply-To: <20181023201956.GA15701@pathfinder> References: <20181023201956.GA15701@pathfinder> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Tue, 2018-10-23 at 21:19 +0100, Phillip Potter wrote: > Replace if/else statements with common lookup table implementation. > > Original patch written by Amir Goldstein. > > Signed-off-by: Phillip Potter > --- > 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 f37662675c3a..7b798a46c8ac 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"); Looks good. Nice cleanup. Reviewed-by: Vyacheslav Dubeyko Thanks, Vyacheslav Dubeyko.