From patchwork Mon Mar 3 22:18:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 326078 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 674302C00CB for ; Tue, 4 Mar 2014 09:18:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755385AbaCCWSn (ORCPT ); Mon, 3 Mar 2014 17:18:43 -0500 Received: from imap.thunk.org ([74.207.234.97]:36552 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755305AbaCCWSn (ORCPT ); Mon, 3 Mar 2014 17:18:43 -0500 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.80) (envelope-from ) id 1WKbC5-0008Ml-Ek; Mon, 03 Mar 2014 22:18:41 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id A9F60580249; Mon, 3 Mar 2014 17:18:40 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=thunk.org; s=mail; t=1393885120; bh=7jW/XfjKRROGeFSAjGviXlpVZxhW3J0LXTxLfk3OpSI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FRWYOZj9GDlgTtoIwJPVqYZPj6fCREGvZ0zhmzpv48tXm+k1mekXSW3NJVEfCr6jQ mEkJfEcu7FGZi0jIMUDmpo9aWNtp56XnRWFr3APSBnBibmxs889cE5TenWze/YSlzf xQ4ZqtTNvsQCaF/9hw+ZNmfqIv0XVLZ9aij060tE= Date: Mon, 3 Mar 2014 17:18:40 -0500 From: Theodore Ts'o To: Zheng Liu Cc: linux-ext4@vger.kernel.org, "Darrick J. Wong" , Zheng Liu Subject: Re: [PATCH v3 24/30] e2fsck: check inline_data in pass1 Message-ID: <20140303221840.GB4452@thunk.org> References: <1386323897-2354-1-git-send-email-wenqing.lz@taobao.com> <1386323897-2354-25-git-send-email-wenqing.lz@taobao.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1386323897-2354-25-git-send-email-wenqing.lz@taobao.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Fri, Dec 06, 2013 at 05:58:11PM +0800, Zheng Liu wrote: > From: Zheng Liu > > Signed-off-by: Theodore Ts'o > Signed-off-by: Zheng Liu With my change to patch 11/30, the following change is needed to this patch. - Ted Reviewed-by: Zheng Liu --- To unsubscribe from this list: send the line "unsubscribe linux-ext4" 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/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c index 1e36584..2fbb772 100644 --- a/lib/ext2fs/dblist_dir.c +++ b/lib/ext2fs/dblist_dir.c @@ -78,9 +78,7 @@ static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry2 *db_info, return DBLIST_ABORT; if (inode.i_flags & EXT4_INLINE_DATA_FL) { ctx->flags = DIRENT_FLAG_INCLUDE_INLINE_DATA; - ext2fs_inline_data_dir_iterate(fs, ctx->dir, - ext2fs_process_dir_block, - ctx); + ret = ext2fs_inline_data_dir_iterate(fs, ctx->dir, ctx); } else { ret = ext2fs_process_dir_block(fs, &db_info->blk, db_info->blockcnt, 0, 0,