hfsplus: emit proper file type from readdir
Subsystems (2)
PATCH v2 1/1 hfsplus: emit proper file type from readdir
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 <[email protected]>
Cc Al Viro <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Vyacheslav Dubeyko <[email protected]>
Cc Hin-Tak Leung <[email protected]>
Signed-off-by Sergei Antonov <[email protected]>
--- fs/hfsplus/dir.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
fs/hfsplus/dir.c +19 -1
@@ -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" );
Signature · 1 line
1.9.0