From patchwork Fri Aug 7 10:41:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ?? X-Patchwork-Id: 6967701 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AFECBC05AC for ; Fri, 7 Aug 2015 10:42:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C30A920653 for ; Fri, 7 Aug 2015 10:42:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA5DC205E3 for ; Fri, 7 Aug 2015 10:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752236AbbHGKmP (ORCPT ); Fri, 7 Aug 2015 06:42:15 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:33043 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240AbbHGKmN (ORCPT ); Fri, 7 Aug 2015 06:42:13 -0400 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NSP00LQOKDQNC50@mailout2.samsung.com>; Fri, 07 Aug 2015 19:41:50 +0900 (KST) X-AuditID: cbfee61a-f79a06d000005c6f-57-55c48b6ee020 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id CF.36.23663.E6B84C55; Fri, 7 Aug 2015 19:41:50 +0900 (KST) Received: from yuchao ([109.123.105.89]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NSP00E79KCHT450@mmp1.samsung.com>; Fri, 07 Aug 2015 19:41:50 +0900 (KST) From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/4] f2fs: handle error of f2fs_iget correctly Date: Fri, 07 Aug 2015 18:41:02 +0800 Message-id: <018001d0d0fd$a8f47240$fadd56c0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdDQ/CibsgfeHaBMSsSBeVV2TSV3Rg== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t9jAd287iOhBleuKFk8WT+L2eLSIneL PXtPslhc3jWHzYHFY9OqTjaP3Qs+M3l83iQXwBzFZZOSmpNZllqkb5fAlfHm1H/GgicSFbO7 TzA2MO4S6WLk5JAQMJE40t7OAmGLSVy4t54NxBYSWMoo8WBPeBcjF5D9ilHibPcRsASbgIrE 8o7/TCC2CJB9aNFldhCbWSBTYsL++WCDhAXsJJY/mAEWZxFQlTj/6RYjiM0rYCnR9fMiE4Qt KPFj8j0WiF4tifU7jzNB2PISm9e8ZYY4SEFix9nXjBC79CR6935khagRl9h45BbLBEaBWUhG zUIyahaSUbOQtCxgZFnFKJFakFxQnJSea5iXWq5XnJhbXJqXrpecn7uJERzOz6R2MB7c5X6I UYCDUYmHN/Hf4VAh1sSy4srcQ4wSHMxKIrxnq4+ECvGmJFZWpRblxxeV5qQWH2KU5mBREueV 3bA5VEggPbEkNTs1tSC1CCbLxMEp1cCYsJntp8o+tutZXiccHhacvt1znC9hXuSdLPaoC892 POvafEH0cbSdTtzWl81T2K5IzP3daXjhDc8R45o51br71ht6LJwTzTLlvqmXxHXnx0rHtUo2 17/+GhLOVsxjWVfw++H0Kr/DgS95pURPb1nCse9cus3DvRtOf5qWfHmqJucSqdQUbeEKJZbi jERDLeai4kQAiQ/dF2MCAAA= Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In recover_orphan_inode, if f2fs_iget failed, we change to report the error number to its caller instead of bug_on. Signed-off-by: Chao Yu --- fs/f2fs/checkpoint.c | 25 ++++++++++++++++++------- fs/f2fs/f2fs.h | 2 +- fs/f2fs/super.c | 4 +++- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index c311176..e2def90 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -468,22 +468,28 @@ void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) __remove_ino_entry(sbi, ino, ORPHAN_INO); } -static void recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) +static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) { - struct inode *inode = f2fs_iget(sbi->sb, ino); - f2fs_bug_on(sbi, IS_ERR(inode)); + struct inode *inode; + + inode = f2fs_iget(sbi->sb, ino); + if (IS_ERR(inode)) + return PTR_ERR(inode); + clear_nlink(inode); /* truncate all the data during iput */ iput(inode); + return 0; } -void recover_orphan_inodes(struct f2fs_sb_info *sbi) +int recover_orphan_inodes(struct f2fs_sb_info *sbi) { block_t start_blk, orphan_blocks, i, j; + int err; if (!is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG)) - return; + return 0; set_sbi_flag(sbi, SBI_POR_DOING); @@ -499,14 +505,19 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi) orphan_blk = (struct f2fs_orphan_block *)page_address(page); for (j = 0; j < le32_to_cpu(orphan_blk->entry_count); j++) { nid_t ino = le32_to_cpu(orphan_blk->ino[j]); - recover_orphan_inode(sbi, ino); + err = recover_orphan_inode(sbi, ino); + if (err) { + f2fs_put_page(page, 1); + clear_sbi_flag(sbi, SBI_POR_DOING); + return err; + } } f2fs_put_page(page, 1); } /* clear Orphan Flag */ clear_ckpt_flags(F2FS_CKPT(sbi), CP_ORPHAN_PRESENT_FLAG); clear_sbi_flag(sbi, SBI_POR_DOING); - return; + return 0; } static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 311960c..4a6f69b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1750,7 +1750,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *); void release_orphan_inode(struct f2fs_sb_info *); void add_orphan_inode(struct f2fs_sb_info *, nid_t); void remove_orphan_inode(struct f2fs_sb_info *, nid_t); -void recover_orphan_inodes(struct f2fs_sb_info *); +int recover_orphan_inodes(struct f2fs_sb_info *); int get_valid_checkpoint(struct f2fs_sb_info *); void update_dirty_page(struct inode *, struct page *); void add_dirty_dir_inode(struct inode *); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 12eb69d..e5efb53 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1246,7 +1246,9 @@ try_onemore: f2fs_join_shrinker(sbi); /* if there are nt orphan nodes free them */ - recover_orphan_inodes(sbi); + err = recover_orphan_inodes(sbi); + if (err) + goto free_node_inode; /* read root inode and dentry */ root = f2fs_iget(sb, F2FS_ROOT_INO(sbi));