From: Sergei Antonov Subject: [PATCH v2] hfsplus: emit proper file type from readdir Date: Wed, 7 May 2014 19:06:59 +0200 Message-ID: <1399482419-6600-1-git-send-email-saproj@gmail.com> Cc: Anton Altaparmakov , Al Viro , Christoph Hellwig , Andrew Morton , Vyacheslav Dubeyko , Hin-Tak Leung , Sergei Antonov To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-ee0-f43.google.com ([74.125.83.43]:58823 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751049AbaEGRHL (ORCPT ); Wed, 7 May 2014 13:07:11 -0400 Received: by mail-ee0-f43.google.com with SMTP id d17so958654eek.2 for ; Wed, 07 May 2014 10:07:10 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: v1 -> v2 Micro-optimization suggested by Anton Altaparmakov: "else if" instead of "if" and DT_REG placed first. hfsplus_readdir() incorrectly returned DT_REG for symbolic links and special files. Return DT_REG, DT_LNK, DT_FIFO, DT_CHR, DT_BLK, 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: Anton Altaparmakov Cc: Al Viro Cc: Christoph Hellwig Cc: Andrew Morton Cc: Vyacheslav Dubeyko Cc: Hin-Tak Leung Signed-off-by: Sergei Antonov --- 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..2507ad8 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_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), DT_REG)) + be32_to_cpu(entry.file.id), type)) break; } else { pr_err("bad catalog entry type\n"); -- 1.9.0