From patchwork Tue Jul 31 11:48:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 174229 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 C687C2C0093 for ; Tue, 31 Jul 2012 21:40:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756004Ab2GaLkO (ORCPT ); Tue, 31 Jul 2012 07:40:14 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:54597 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755715Ab2GaLkI (ORCPT ); Tue, 31 Jul 2012 07:40:08 -0400 Received: by mail-gh0-f174.google.com with SMTP id r11so5889814ghr.19 for ; Tue, 31 Jul 2012 04:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=pe11pAAYUQiRx3VzldCEZoMaltYzr3TveDCDQBDUXY8=; b=VzeQiFgHesnZkf22UJWFPsz+D0yG7Km2ZV7laEuGCFU3y+u39Zlp4PJ/GrtBX9L9RO nLPEo5qxZIdFLJ9CEhlt7wO0PJLoSxO8r1Xeug6apof+bSYVVtq2/lBtNALvpgEMnrLO Legplx1uIkMVJ/fa/ExNBR5SloZ/GFyjICXPyOs3olVpr6BMftSMO2LjzZKDeOiwGr7c siZF4rETOsDGSDg4vRPXqKGRxca24CMnZ0VC3zWlEGSco/h/A6ZUs9dDeJ/61T3EKie1 JP3yqqprmlARVk58WtZwVkMr0XPdDHudbEenqQxzfyuyDEnkkU78bMQiSW+2pRq2IKBI wdag== Received: by 10.66.74.3 with SMTP id p3mr31644361pav.49.1343734807416; Tue, 31 Jul 2012 04:40:07 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id oo6sm135950pbc.22.2012.07.31.04.40.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 04:40:06 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 11/36 v4] debugfs: make ls cmd support inline data Date: Tue, 31 Jul 2012 19:48:04 +0800 Message-Id: <1343735309-30579-12-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1343735309-30579-1-git-send-email-wenqing.lz@taobao.com> References: <1343735309-30579-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu Signed-off-by: Zheng Liu --- debugfs/ls.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debugfs/ls.c b/debugfs/ls.c index b4036de..00b497d 100644 --- a/debugfs/ls.c +++ b/debugfs/ls.c @@ -170,8 +170,12 @@ void do_list_dir(int argc, char *argv[]) if (ls.options & DELETED_OPT) flags |= DIRENT_FLAG_INCLUDE_REMOVED; - retval = ext2fs_dir_iterate2(current_fs, inode, flags, - 0, list_dir_proc, &ls); + if (ext2fs_has_inline_data(current_fs, inode)) + retval = ext2fs_inline_data_iterate2(current_fs, inode, flags, + 0, list_dir_proc, &ls); + else + retval = ext2fs_dir_iterate2(current_fs, inode, flags, + 0, list_dir_proc, &ls); fprintf(ls.f, "\n"); close_pager(ls.f); if (retval)