Re: question about fs/jffs2/readinode.c

[Julia Lawall <julia.lawall@lip6.fr>]

On Wed, 2 May 2012, Artem Bityutskiy wrote:

> On Sat, 2012-04-28 at 07:06 +0200, Julia Lawall wrote:
>> The function read_direntry in fs/jffs2/readinode.c contains the following
>> code:
>>
>>          err = jffs2_flash_read(c, (ref_offset(ref)) + read,
>>                                 rd->nsize - already, &read, &fd->name[already]);
>>  	if (unlikely(read != rd->nsize - already) && likely(!err))
>>                        return -EIO;
>>
>>          if (unlikely(err)) {
>>                  JFFS2_ERROR("read remainder of name: error %d\n", err);
>>                  jffs2_free_full_dirent(fd);
>>                  return -EIO;
>>          }
>>
>> Is it intentional that the first if doesn't free fd?  At first I thought
>> that that might be the case, because what would be the point of having two
>> conditionals if they are going to do the same thing.  But I can't see why
>> fd should not be freed either, so maybe the two conditionals are just
>> there to give different error messages?
>
> Hi Julia,
>
> I think this is a bug and thes conditionals can be joined into one.

Thanks!  I will send a patch soon.

julia