The locked page should be released before returning the function.
Signed-off-by: Jaegeuk Kim <[email protected]>
---
fs/f2fs/inline.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 053d114..f26fb87 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -141,8 +141,8 @@ int f2fs_convert_inline_inode(struct inode *inode)
ipage = get_node_page(sbi, inode->i_ino);
if (IS_ERR(ipage)) {
- f2fs_unlock_op(sbi);
- return PTR_ERR(ipage);
+ err = PTR_ERR(ipage);
+ goto out;
}
set_new_dnode(&dn, inode, ipage, ipage, 0);
@@ -151,7 +151,7 @@ int f2fs_convert_inline_inode(struct inode *inode)
err = f2fs_convert_inline_page(&dn, page);
f2fs_put_dnode(&dn);
-
+out:
f2fs_unlock_op(sbi);
f2fs_put_page(page, 1);
--
2.1.1
We should put the inode page when error was occurred.
Signed-off-by: Jaegeuk Kim <[email protected]>
---
fs/f2fs/data.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 8f16443..12dd58a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -963,22 +963,22 @@ repeat:
} else if (page->index == 0) {
err = f2fs_convert_inline_page(&dn, page);
if (err)
- goto unlock_fail;
+ goto put_fail;
} else {
struct page *p = grab_cache_page(inode->i_mapping, 0);
if (!p) {
err = -ENOMEM;
- goto unlock_fail;
+ goto put_fail;
}
err = f2fs_convert_inline_page(&dn, p);
f2fs_put_page(p, 1);
if (err)
- goto unlock_fail;
+ goto put_fail;
}
}
err = f2fs_reserve_block(&dn, index);
if (err)
- goto unlock_fail;
+ goto put_fail;
put_next:
f2fs_put_dnode(&dn);
f2fs_unlock_op(sbi);
@@ -1021,6 +1021,8 @@ out:
clear_cold_data(page);
return 0;
+put_fail:
+ f2fs_put_dnode(&dn);
unlock_fail:
f2fs_unlock_op(sbi);
f2fs_put_page(page, 1);
--
2.1.1
> -----Original Message-----
> From: Jaegeuk Kim [mailto:[email protected]]
> Sent: Tuesday, November 18, 2014 9:58 AM
> To: [email protected]; [email protected];
> [email protected]
> Cc: Jaegeuk Kim
> Subject: [f2fs-dev] [PATCH 1/2] f2fs: fix to call put_page at the error handling routine
>
> The locked page should be released before returning the function.
Good catch! I found this also, now removed from my patch set. :)
>
> Signed-off-by: Jaegeuk Kim <[email protected]>
Reviewed-by: Chao Yu <[email protected]>
Hi Jaegeuk,
> -----Original Message-----
> From: Jaegeuk Kim [mailto:[email protected]]
> Sent: Tuesday, November 18, 2014 9:58 AM
> To: [email protected]; [email protected];
> [email protected]
> Cc: Jaegeuk Kim
> Subject: [f2fs-dev] [PATCH 2/2] f2fs: put the inode page when error was occurred
>
> We should put the inode page when error was occurred.
>
> Signed-off-by: Jaegeuk Kim <[email protected]>
You can add Reviewed-by: Chao Yu <[email protected]>
after the following issue is fixed.
> ---
> fs/f2fs/data.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> index 8f16443..12dd58a 100644
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@ -963,22 +963,22 @@ repeat:
> } else if (page->index == 0) {
> err = f2fs_convert_inline_page(&dn, page);
> if (err)
> - goto unlock_fail;
> + goto put_fail;
> } else {
> struct page *p = grab_cache_page(inode->i_mapping, 0);
> if (!p) {
> err = -ENOMEM;
> - goto unlock_fail;
> + goto put_fail;
> }
> err = f2fs_convert_inline_page(&dn, p);
> f2fs_put_page(p, 1);
> if (err)
> - goto unlock_fail;
> + goto put_fail;
> }
> }
> err = f2fs_reserve_block(&dn, index);
> if (err)
> - goto unlock_fail;
> + goto put_fail;
f2fs_reserve_block will do the clean work, we should not release dn again.
Thanks,
Yu
> put_next:
> f2fs_put_dnode(&dn);
> f2fs_unlock_op(sbi);
> @@ -1021,6 +1021,8 @@ out:
> clear_cold_data(page);
> return 0;
>
> +put_fail:
> + f2fs_put_dnode(&dn);
> unlock_fail:
> f2fs_unlock_op(sbi);
> f2fs_put_page(page, 1);
> --
> 2.1.1
>
>
> ------------------------------------------------------------------------------
> Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> with Interactivity, Sharing, Native Excel Exports, App Integration & more
> Get technology previously reserved for billion-dollar corporations, FREE
> http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
> _______________________________________________
> Linux-f2fs-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
On Tue, Nov 18, 2014 at 01:30:46PM +0800, Chao Yu wrote:
> Hi Jaegeuk,
>
> > -----Original Message-----
> > From: Jaegeuk Kim [mailto:[email protected]]
> > Sent: Tuesday, November 18, 2014 9:58 AM
> > To: [email protected]; [email protected];
> > [email protected]
> > Cc: Jaegeuk Kim
> > Subject: [f2fs-dev] [PATCH 2/2] f2fs: put the inode page when error was occurred
> >
> > We should put the inode page when error was occurred.
> >
> > Signed-off-by: Jaegeuk Kim <[email protected]>
>
> You can add Reviewed-by: Chao Yu <[email protected]>
> after the following issue is fixed.
>
> > ---
> > fs/f2fs/data.c | 10 ++++++----
> > 1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
> > index 8f16443..12dd58a 100644
> > --- a/fs/f2fs/data.c
> > +++ b/fs/f2fs/data.c
> > @@ -963,22 +963,22 @@ repeat:
> > } else if (page->index == 0) {
> > err = f2fs_convert_inline_page(&dn, page);
> > if (err)
> > - goto unlock_fail;
> > + goto put_fail;
> > } else {
> > struct page *p = grab_cache_page(inode->i_mapping, 0);
> > if (!p) {
> > err = -ENOMEM;
> > - goto unlock_fail;
> > + goto put_fail;
> > }
> > err = f2fs_convert_inline_page(&dn, p);
> > f2fs_put_page(p, 1);
> > if (err)
> > - goto unlock_fail;
> > + goto put_fail;
> > }
> > }
> > err = f2fs_reserve_block(&dn, index);
> > if (err)
> > - goto unlock_fail;
> > + goto put_fail;
>
> f2fs_reserve_block will do the clean work, we should not release dn again.
Well, I added this to handle errors consistently.
It's harmless, since f2fs_put_dnode removes the pointers after putting them.
Thanks,
>
> Thanks,
> Yu
>
> > put_next:
> > f2fs_put_dnode(&dn);
> > f2fs_unlock_op(sbi);
> > @@ -1021,6 +1021,8 @@ out:
> > clear_cold_data(page);
> > return 0;
> >
> > +put_fail:
> > + f2fs_put_dnode(&dn);
> > unlock_fail:
> > f2fs_unlock_op(sbi);
> > f2fs_put_page(page, 1);
> > --
> > 2.1.1
> >
> >
> > ------------------------------------------------------------------------------
> > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
> > from Actuate! Instantly Supercharge Your Business Reports and Dashboards
> > with Interactivity, Sharing, Native Excel Exports, App Integration & more
> > Get technology previously reserved for billion-dollar corporations, FREE
> > http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
> > _______________________________________________
> > Linux-f2fs-devel mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel