[PATCH] hfsplus: emit proper file type from readdir

[Sergei Antonov <saproj@gmail.com>]

hfsplus_readdir() incorrectly returned DT_REG for symbolic links and special
files. Return DT_LNK, DT_FIFO, DT_CHR, DT_REG, DT_SOCK, or DT_UNKNOWN according
to mode field in catalog record. Programs relying on information from readdir
will now work correctly with HFS+.

CC: Al Viro <viro@zeniv.linux.org.uk>
CC: Christoph Hellwig <hch@infradead.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Vyacheslav Dubeyko <slava@dubeyko.com>
CC: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: Sergei Antonov <saproj@gmail.com>
---
 fs/hfsplus/dir.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index bdec665..8397d64 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -212,13 +212,31 @@ static int hfsplus_readdir(struct file *file, struct dir_context *ctx)
 				    be32_to_cpu(entry.folder.id), DT_DIR))
 				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");
 				err = -EIO;
 				goto out;
 			}
+
+			mode = be16_to_cpu(entry.file.permissions.mode);
+			if (S_ISFIFO(mode))
+				type = DT_FIFO;
+			if (S_ISCHR(mode))
+				type = DT_CHR;
+			if (S_ISBLK(mode))
+				type = DT_BLK;
+			if (S_ISREG(mode))
+				type = DT_REG;
+			if (S_ISLNK(mode))
+				type = DT_LNK;
+			if (S_ISSOCK(mode))
+				type = DT_SOCK;
+
 			if (!dir_emit(ctx, strbuf, len,
-				    be32_to_cpu(entry.file.id), DT_REG))
+				      be32_to_cpu(entry.file.id), type))
 				break;
 		} else {
 			pr_err("bad catalog entry type\n");
-- 
1.9.0