From: Zheng Liu Subject: [PATCH 18/32] debugfs: make rmdir cmd support inline data Date: Mon, 16 Apr 2012 19:39:53 +0800 Message-ID: <1334576407-4007-19-git-send-email-wenqing.lz@taobao.com> References: <1334576407-4007-1-git-send-email-wenqing.lz@taobao.com> Cc: Zheng Liu To: linux-ext4@vger.kernel.org Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:43674 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753145Ab2DPLe0 (ORCPT ); Mon, 16 Apr 2012 07:34:26 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so6233785pbc.19 for ; Mon, 16 Apr 2012 04:34:26 -0700 (PDT) In-Reply-To: <1334576407-4007-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: From: Zheng Liu Signed-off-by: Zheng Liu --- debugfs/debugfs.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index 17e5ec8..7a97c48 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -1948,8 +1948,12 @@ void do_rmdir(int argc, char *argv[]) rds.parent = 0; rds.empty = 1; - retval = ext2fs_dir_iterate2(current_fs, inode_num, 0, - 0, rmdir_proc, &rds); + if (ext2fs_has_inline_data(current_fs, inode_num)) + retval = ext2fs_inline_data_iterate2(current_fs, inode_num, 0, + 0, rmdir_proc, &rds); + else + retval = ext2fs_dir_iterate2(current_fs, inode_num, 0, + 0, rmdir_proc, &rds); if (retval) { com_err(argv[0], retval, "while iterating over directory"); return; -- 1.7.4.1