If erofs_fscache_alloc_request fail and then goto out, it will return 0.
it should return a negative error code instead of 0.
Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
Signed-off-by: Sun Ke <[email protected]>
---
fs/erofs/fscache.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 8e01d89c3319..b5fd9d71e67f 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -222,8 +222,10 @@ static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
rreq = erofs_fscache_alloc_request(folio_mapping(folio),
folio_pos(folio), folio_size(folio));
- if (IS_ERR(rreq))
+ if (IS_ERR(rreq)) {
+ ret = PTR_ERR(rreq);
goto out;
+ }
return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
rreq, mdev.m_pa);
@@ -301,8 +303,10 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
rreq = erofs_fscache_alloc_request(folio_mapping(folio),
folio_pos(folio), folio_size(folio));
- if (IS_ERR(rreq))
+ if (IS_ERR(rreq)) {
+ ret = PTR_ERR(rreq);
goto out_unlock;
+ }
pstart = mdev.m_pa + (pos - map.m_la);
return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
--
2.31.1
On Mon, Aug 15, 2022 at 11:48:29AM +0800, Sun Ke wrote:
> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
> it should return a negative error code instead of 0.
>
> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
> Signed-off-by: Sun Ke <[email protected]>
Thanks for the catch! Looks good to me,
Reviewed-by: Gao Xiang <[email protected]>
Thanks,
Gao Xiang
> ---
> fs/erofs/fscache.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index 8e01d89c3319..b5fd9d71e67f 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -222,8 +222,10 @@ static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
>
> rreq = erofs_fscache_alloc_request(folio_mapping(folio),
> folio_pos(folio), folio_size(folio));
> - if (IS_ERR(rreq))
> + if (IS_ERR(rreq)) {
> + ret = PTR_ERR(rreq);
> goto out;
> + }
>
> return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
> rreq, mdev.m_pa);
> @@ -301,8 +303,10 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
>
> rreq = erofs_fscache_alloc_request(folio_mapping(folio),
> folio_pos(folio), folio_size(folio));
> - if (IS_ERR(rreq))
> + if (IS_ERR(rreq)) {
> + ret = PTR_ERR(rreq);
> goto out_unlock;
> + }
>
> pstart = mdev.m_pa + (pos - map.m_la);
> return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
> --
> 2.31.1
On 8/15/22 11:48 AM, Sun Ke via Linux-erofs wrote:
> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
> it should return a negative error code instead of 0.
>
> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
> Signed-off-by: Sun Ke <[email protected]>
LGTM.
Reviewed-by: Jingbo Xu <[email protected]>
> ---
> fs/erofs/fscache.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index 8e01d89c3319..b5fd9d71e67f 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -222,8 +222,10 @@ static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
>
> rreq = erofs_fscache_alloc_request(folio_mapping(folio),
> folio_pos(folio), folio_size(folio));
> - if (IS_ERR(rreq))
> + if (IS_ERR(rreq)) {
> + ret = PTR_ERR(rreq);
> goto out;
> + }
>
> return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
> rreq, mdev.m_pa);
> @@ -301,8 +303,10 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
>
> rreq = erofs_fscache_alloc_request(folio_mapping(folio),
> folio_pos(folio), folio_size(folio));
> - if (IS_ERR(rreq))
> + if (IS_ERR(rreq)) {
> + ret = PTR_ERR(rreq);
> goto out_unlock;
> + }
>
> pstart = mdev.m_pa + (pos - map.m_la);
> return erofs_fscache_read_folios_async(mdev.m_fscache->cookie,
--
Thanks,
Jingbo
On Mon, Aug 15, 2022 at 11:48:29AM +0800, Sun Ke wrote:
> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
> it should return a negative error code instead of 0.
>
> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
> Signed-off-by: Sun Ke <[email protected]>
Minor, I tried to apply this patch by updating the patch title into
"erofs: fix error return code in erofs_fscache_{meta_,}read_folio"
since the original patch title is too long.
Thanks,
Gao Xiang
在 2022/8/16 13:16, Gao Xiang 写道:
> On Mon, Aug 15, 2022 at 11:48:29AM +0800, Sun Ke wrote:
>> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
>> it should return a negative error code instead of 0.
>>
>> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
>> Signed-off-by: Sun Ke <[email protected]>
>
> Minor, I tried to apply this patch by updating the patch title into
> "erofs: fix error return code in erofs_fscache_{meta_,}read_folio"
>
> since the original patch title is too long.
Should I send a v2 patch to update the title?
Thanks,
Sun Ke
>
> Thanks,
> Gao Xiang
> .
>
Hi Ke,
On Wed, Aug 17, 2022 at 09:44:46AM +0800, Sun Ke wrote:
>
>
> 在 2022/8/16 13:16, Gao Xiang 写道:
> > On Mon, Aug 15, 2022 at 11:48:29AM +0800, Sun Ke wrote:
> > > If erofs_fscache_alloc_request fail and then goto out, it will return 0.
> > > it should return a negative error code instead of 0.
> > >
> > > Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
> > > Signed-off-by: Sun Ke <[email protected]>
> >
> > Minor, I tried to apply this patch by updating the patch title into
> > "erofs: fix error return code in erofs_fscache_{meta_,}read_folio"
> >
> > since the original patch title is too long.
>
> Should I send a v2 patch to update the title?
I've already updated this by hand if you have no concern ;)
will push out to -next today...
Thanks,
Gao Xiang
>
> Thanks,
> Sun Ke
> >
> > Thanks,
> > Gao Xiang
> > .
> >
在 2022/8/17 10:41, Gao Xiang 写道:
> Hi Ke,
>
> On Wed, Aug 17, 2022 at 09:44:46AM +0800, Sun Ke wrote:
>>
>>
>> 在 2022/8/16 13:16, Gao Xiang 写道:
>>> On Mon, Aug 15, 2022 at 11:48:29AM +0800, Sun Ke wrote:
>>>> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
>>>> it should return a negative error code instead of 0.
>>>>
>>>> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
>>>> Signed-off-by: Sun Ke <[email protected]>
>>>
>>> Minor, I tried to apply this patch by updating the patch title into
>>> "erofs: fix error return code in erofs_fscache_{meta_,}read_folio"
>>>
>>> since the original patch title is too long.
>>
>> Should I send a v2 patch to update the title?
>
> I've already updated this by hand if you have no concern ;)
> will push out to -next today...
;)
Thanks,
Sun Ke
>
> Thanks,
> Gao Xiang
>
>>
>> Thanks,
>> Sun Ke
>>>
>>> Thanks,
>>> Gao Xiang
>>> .
>>>
> .
>
On 2022/8/15 11:48, Sun Ke wrote:
> If erofs_fscache_alloc_request fail and then goto out, it will return 0.
> it should return a negative error code instead of 0.
>
> Fixes: d435d53228dd ("erofs: change to use asynchronous io for fscache readpage/readahead")
> Signed-off-by: Sun Ke <[email protected]>
Reviewed-by: Chao Yu <[email protected]>
Thanks,