Re: [PATCH] hfsplus: emit symlinks from readdir properly

[Sergei Antonov <saproj@gmail.com>]

On 7 May 2014 16:18, Vyacheslav Dubeyko <slava@dubeyko.com> wrote:
> Hi Sergei,
>
> On Wed, 2014-05-07 at 14:08 +0200, Sergei Antonov wrote:
>> hfsplus_readdir() did not return DT_LNK record type for symbolic links. It
>> emitted them as regular files (DT_REG). Programs relying on information from
>> readdir did not work correctly with HFS+.
>>
>
> This patch looks good for me. But what about another file types
> (S_IFIFO, S_IFCHR, S_IFBLK, S_IFSOCK)?

I will resubmit to support them too. Thanks.
In this patch I tried to fix the problem I faced (and it was with
symlinks). Now I see that the fix can be broader. Resubmitting in a
minute.

> Thanks,
> Vyacheslav Dubeyko.
>
>> 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 | 6 +++++-
>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
>> index bdec665..c5ccb11 100644
>> --- a/fs/hfsplus/dir.c
>> +++ b/fs/hfsplus/dir.c
>> @@ -212,13 +212,17 @@ 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;
>> +
>>                       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 (!dir_emit(ctx, strbuf, len,
>> -                                 be32_to_cpu(entry.file.id), DT_REG))
>> +                                   be32_to_cpu(entry.file.id),
>> +                                   S_ISLNK(mode) ? DT_LNK : DT_REG))
>>                               break;
>>               } else {
>>                       pr_err("bad catalog entry type\n");
>
>