| Message ID | 1436901502-78825-1-git-send-email-jaegeuk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Jaegeuk, > -----Original Message----- > From: Jaegeuk Kim [mailto:jaegeuk@kernel.org] > Sent: Wednesday, July 15, 2015 3:18 AM > To: linux-kernel@vger.kernel.org; linux-fsdevel@vger.kernel.org; > linux-f2fs-devel@lists.sourceforge.net > Cc: Jaegeuk Kim > Subject: [f2fs-dev] [PATCH 1/2] f2fs: handle error cases in move_encrypted_block > > This patch fixes some missing error handlers. > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> > --- > fs/f2fs/gc.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > index 11046db..db11861 100644 > --- a/fs/f2fs/gc.c > +++ b/fs/f2fs/gc.c > @@ -556,27 +556,34 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) > if (!fio.encrypted_page) > goto put_out; > > - f2fs_submit_page_bio(&fio); > - > - /* allocate block address */ > - f2fs_wait_on_page_writeback(dn.node_page, NODE); > - > - allocate_data_block(fio.sbi, NULL, fio.blk_addr, > - &fio.blk_addr, &sum, CURSEG_COLD_DATA); > - dn.data_blkaddr = fio.blk_addr; > + err = f2fs_submit_page_bio(&fio); > + if (err) > + goto put_page_out; f2fs_submit_page_bio will put the page when failed. So goto put_out is enough? > > /* write page */ > lock_page(fio.encrypted_page); > + > + if (unlikely(!PageUptodate(fio.encrypted_page))) > + goto put_page_out; > + if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) > + goto put_page_out; > + > set_page_writeback(fio.encrypted_page); > fio.rw = WRITE_SYNC; > f2fs_submit_page_mbio(&fio); > > + /* allocate block address */ > + f2fs_wait_on_page_writeback(dn.node_page, NODE); > + allocate_data_block(fio.sbi, NULL, fio.blk_addr, > + &fio.blk_addr, &sum, CURSEG_COLD_DATA); move above f2fs_submit_page_mbio(&fio) to here? Thanks, > + dn.data_blkaddr = fio.blk_addr; > + > set_data_blkaddr(&dn); > f2fs_update_extent_cache(&dn); > set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE); > if (page->index == 0) > set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN); > - > +put_page_out: > f2fs_put_page(fio.encrypted_page, 1); > put_out: > f2fs_put_dnode(&dn); > -- > 2.1.1 > > > ------------------------------------------------------------------------------ > Don't Limit Your Business. Reach for the Cloud. > GigeNET's Cloud Solutions provide you with the tools and support that > you need to offload your IT needs and focus on growing your business. > Configured For All Businesses. Start Your Cloud Today. > https://www.gigenetcloud.com/ > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jul 15, 2015 at 09:39:47AM +0800, Chao Yu wrote: > Hi Jaegeuk, > > > -----Original Message----- > > From: Jaegeuk Kim [mailto:jaegeuk@kernel.org] > > Sent: Wednesday, July 15, 2015 3:18 AM > > To: linux-kernel@vger.kernel.org; linux-fsdevel@vger.kernel.org; > > linux-f2fs-devel@lists.sourceforge.net > > Cc: Jaegeuk Kim > > Subject: [f2fs-dev] [PATCH 1/2] f2fs: handle error cases in move_encrypted_block > > > > This patch fixes some missing error handlers. > > > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> > > --- > > fs/f2fs/gc.c | 25 ++++++++++++++++--------- > > 1 file changed, 16 insertions(+), 9 deletions(-) > > > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > > index 11046db..db11861 100644 > > --- a/fs/f2fs/gc.c > > +++ b/fs/f2fs/gc.c > > @@ -556,27 +556,34 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) > > if (!fio.encrypted_page) > > goto put_out; > > > > - f2fs_submit_page_bio(&fio); > > - > > - /* allocate block address */ > > - f2fs_wait_on_page_writeback(dn.node_page, NODE); > > - > > - allocate_data_block(fio.sbi, NULL, fio.blk_addr, > > - &fio.blk_addr, &sum, CURSEG_COLD_DATA); > > - dn.data_blkaddr = fio.blk_addr; > > + err = f2fs_submit_page_bio(&fio); > > + if (err) > > + goto put_page_out; > > f2fs_submit_page_bio will put the page when failed. > > So goto put_out is enough? Right. BTW, I realized that this is somewhat wrong, since this function needs to take care of its page for error cases too. I wrote a patch dealing with errors of f2fs_submit_page_bio, and submitted it right ago. > > > > > /* write page */ > > lock_page(fio.encrypted_page); > > + > > + if (unlikely(!PageUptodate(fio.encrypted_page))) > > + goto put_page_out; > > + if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) > > + goto put_page_out; > > + > > set_page_writeback(fio.encrypted_page); > > fio.rw = WRITE_SYNC; > > f2fs_submit_page_mbio(&fio); > > > > + /* allocate block address */ > > + f2fs_wait_on_page_writeback(dn.node_page, NODE); > > + allocate_data_block(fio.sbi, NULL, fio.blk_addr, > > + &fio.blk_addr, &sum, CURSEG_COLD_DATA); > > move above f2fs_submit_page_mbio(&fio) to here? Fixed. Thanks, -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 11046db..db11861 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -556,27 +556,34 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) if (!fio.encrypted_page) goto put_out; - f2fs_submit_page_bio(&fio); - - /* allocate block address */ - f2fs_wait_on_page_writeback(dn.node_page, NODE); - - allocate_data_block(fio.sbi, NULL, fio.blk_addr, - &fio.blk_addr, &sum, CURSEG_COLD_DATA); - dn.data_blkaddr = fio.blk_addr; + err = f2fs_submit_page_bio(&fio); + if (err) + goto put_page_out; /* write page */ lock_page(fio.encrypted_page); + + if (unlikely(!PageUptodate(fio.encrypted_page))) + goto put_page_out; + if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) + goto put_page_out; + set_page_writeback(fio.encrypted_page); fio.rw = WRITE_SYNC; f2fs_submit_page_mbio(&fio); + /* allocate block address */ + f2fs_wait_on_page_writeback(dn.node_page, NODE); + allocate_data_block(fio.sbi, NULL, fio.blk_addr, + &fio.blk_addr, &sum, CURSEG_COLD_DATA); + dn.data_blkaddr = fio.blk_addr; + set_data_blkaddr(&dn); f2fs_update_extent_cache(&dn); set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE); if (page->index == 0) set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN); - +put_page_out: f2fs_put_page(fio.encrypted_page, 1); put_out: f2fs_put_dnode(&dn);
This patch fixes some missing error handlers. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/gc.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)