* [RFC][PATCH 03/10] hfsplus: use fs_umode_to_dtype() helper
@ 2018-10-23 20:19 Phillip Potter
2018-10-23 22:42 ` Viacheslav Dubeyko
0 siblings, 1 reply; 2+ messages in thread
From: Phillip Potter @ 2018-10-23 20:19 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-kernel, amir73il, viro
Replace if/else statements with common lookup table implementation.
Original patch written by Amir Goldstein.
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
---
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");
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [RFC][PATCH 03/10] hfsplus: use fs_umode_to_dtype() helper
2018-10-23 20:19 [RFC][PATCH 03/10] hfsplus: use fs_umode_to_dtype() helper Phillip Potter
@ 2018-10-23 22:42 ` Viacheslav Dubeyko
0 siblings, 0 replies; 2+ messages in thread
From: Viacheslav Dubeyko @ 2018-10-23 22:42 UTC (permalink / raw)
To: Phillip Potter; +Cc: linux-fsdevel, linux-kernel, amir73il, viro
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 <phil@philpotter.co.uk>
> ---
> 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 <slava@dubeyko.com>
Thanks,
Vyacheslav Dubeyko.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-24 7:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-23 20:19 [RFC][PATCH 03/10] hfsplus: use fs_umode_to_dtype() helper Phillip Potter
2018-10-23 22:42 ` Viacheslav Dubeyko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).