From patchwork Mon Apr 16 11:39:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 152795 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 57443B7003 for ; Mon, 16 Apr 2012 21:34:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753222Ab2DPLeO (ORCPT ); Mon, 16 Apr 2012 07:34:14 -0400 Received: from mail-pz0-f52.google.com ([209.85.210.52]:62902 "EHLO mail-pz0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030Ab2DPLeO (ORCPT ); Mon, 16 Apr 2012 07:34:14 -0400 Received: by mail-pz0-f52.google.com with SMTP id e40so6801134dak.11 for ; Mon, 16 Apr 2012 04:34:13 -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=3X+2Z0FB8RhsnzfjeK+c8lhpe30kLbo3S0cI8HMAYSE=; b=cDKAlG6f2Fdj09ojg7sdStQJH1Ik8yDSk253laMfYxP9LF3ga3hHBxlpk0KbMz36AR fEISXZqr/DKVRSqpbUFKGx3jVXIlSE2/KbH/t0EBSzGcepRoTCneW4dBk/sgop1Zc6Eh hPAVr/rSughmVHzfdD0yAfhWdiaL7SwyotTO3GRWV9S+kSmA1iVxctUeiOS1zMFsCVNa stygMGyUUb8usXs3qrqLRmylNASnyN9mwdK8O2RXaO7W/zOIiplcmWswV9KuhMVnU+H1 lrYyAF0M+XvB5zu/ruCMMJweE1a+N4xQaA8yLUImBpoa4DHT4Jynwj8VcvjM/Dq/M6H7 YG7g== Received: by 10.68.240.5 with SMTP id vw5mr27110790pbc.110.1334576053869; Mon, 16 Apr 2012 04:34:13 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id l6sm17474160pbp.33.2012.04.16.04.34.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Apr 2012 04:34:13 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 11/32] debugfs: make ls cmd support inline data Date: Mon, 16 Apr 2012 19:39:46 +0800 Message-Id: <1334576407-4007-12-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1334576407-4007-1-git-send-email-wenqing.lz@taobao.com> References: <1334576407-4007-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..14e7022 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)