* [PATCH v6 02/07] hfsplus: use fs_umode_to_dtype() helper
@ 2019-03-26 21:39 Phillip Potter
0 siblings, 0 replies; only message in thread
From: Phillip Potter @ 2019-03-26 21:39 UTC (permalink / raw)
To: linux-fsdevel; +Cc: ernesto.mnd.fernandez, akpm, amir73il, viro, slava
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
Common implementation can be found via commit:
bbe7449e2599 "fs: common implementation of file type"
Reviewed-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Reviewed-by: Jan Kara <jack@suse.cz>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-03-26 21:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-26 21:39 [PATCH v6 02/07] hfsplus: use fs_umode_to_dtype() helper Phillip Potter
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).