Re: [PATCH] ovl: update ctx->pos on impure dir iteration

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Nov 29, 2017 at 2:46 PM, Miguel Bernal Marin
<miguel.bernal.marin@xxxxxxxxxxxxxxx> wrote:
> On Wed, Nov 29, 2017 at 07:35:21AM +0200, Amir Goldstein wrote:
>> This fixes a regression with readdir of impure dir in overlayfs
>> that is shared to VM via 9p fs.
>>
>> Reported-by: Miguel Bernal Marin <miguel.bernal.marin@xxxxxxxxxxxxxxx>
>> Fixes: 4edb83bb1041 ("ovl: constant d_ino for non-merge dirs")
>> Cc: <stable@xxxxxxxxxxxxxxx> #4.14
>> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
>> ---
>>  fs/overlayfs/readdir.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
>> index 502dc0966f91..b98f1efe50c1 100644
>> --- a/fs/overlayfs/readdir.c
>> +++ b/fs/overlayfs/readdir.c
>> @@ -663,7 +663,10 @@ static int ovl_iterate_real(struct file *file, struct dir_context *ctx)
>>                       return PTR_ERR(rdt.cache);
>>       }
>>
>> -     return iterate_dir(od->realfile, &rdt.ctx);
>> +     err = iterate_dir(od->realfile, &rdt.ctx);
>> +     ctx->pos = rdt.ctx.pos;
>> +
>> +     return err;
>>  }
>
> This fix the issue with 9P and Overlay
>
> Tested-by: Miguel Bernal Marin <miguel.bernal.marin@xxxxxxxxxxxxxxx>

Thanks, applied.

Miklos
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystems Devel]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux