Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751329Ab3CRFXj (ORCPT ); Mon, 18 Mar 2013 01:23:39 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:64974 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703Ab3CRFXg convert rfc822-to-8bit (ORCPT ); Mon, 18 Mar 2013 01:23:36 -0400 MIME-Version: 1.0 In-Reply-To: <1363573173.14386.70.camel@kjgkr> References: <1363508840-2954-1-git-send-email-linkinjeon@gmail.com> <1363573173.14386.70.camel@kjgkr> Date: Mon, 18 Mar 2013 14:23:36 +0900 Message-ID: Subject: Re: [PATCH 5/5] f2fs: avoid BUG_ON from check_nid_range and update return path in do_read_inode From: Namjae Jeon To: jaegeuk.kim@samsung.com Cc: linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Namjae Jeon , Amit Sahrawat Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2475 Lines: 74 2013/3/18, Jaegeuk Kim : > 2013-03-17 (일), 17:27 +0900, Namjae Jeon: >> From: Namjae Jeon >> >> In function check_nid_range, there is no need to trigger BUG_ON and make >> kernel stop. >> Instead it could just check and indicate the inode number to be EINVAL. >> Update the return path in do_read_inode to use the return from >> check_nid_range. >> >> Signed-off-by: Namjae Jeon >> Signed-off-by: Amit Sahrawat >> --- >> fs/f2fs/f2fs.h | 6 ++++-- >> fs/f2fs/inode.c | 6 +++++- >> 2 files changed, 9 insertions(+), 3 deletions(-) >> >> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h >> index be7ae70..1dae921 100644 >> --- a/fs/f2fs/f2fs.h >> +++ b/fs/f2fs/f2fs.h >> @@ -515,9 +515,11 @@ static inline void mutex_unlock_op(struct >> f2fs_sb_info *sbi, enum lock_type t) >> /* >> * Check whether the given nid is within node id range. >> */ >> -static inline void check_nid_range(struct f2fs_sb_info *sbi, nid_t nid) >> +static inline int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid) >> { >> - BUG_ON((nid >= NM_I(sbi)->max_nid)); >> + if (nid >= NM_I(sbi)->max_nid) >> + return -EINVAL; >> + return 0; > Hi Jaegeuk. > At this moment, I'd like to apply this patch and remain BUG_ON together > since we should find real bugs in f2fs. > How do you think? Instead of BUG_ON, we can make use of WARN_ON as that can also solve our purpose of finding the real bugs with the same information (back trace) and will also keep system running. Thanks :) > >> } >> >> #define F2FS_DEFAULT_ALLOCATED_BLOCKS 1 >> diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c >> index ddae412..6d82020 100644 >> --- a/fs/f2fs/inode.c >> +++ b/fs/f2fs/inode.c >> @@ -44,7 +44,11 @@ static int do_read_inode(struct inode *inode) >> struct f2fs_inode *ri; >> >> /* Check if ino is within scope */ >> - check_nid_range(sbi, inode->i_ino); >> + if (check_nid_range(sbi, inode->i_ino)) { >> + f2fs_msg(inode->i_sb, KERN_ERR, "bad inode number: %lu", >> + (unsigned long) inode->i_ino); >> + return -EINVAL; >> + } >> >> node_page = get_node_page(sbi, inode->i_ino); >> if (IS_ERR(node_page)) > > -- > Jaegeuk Kim > Samsung > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/