From patchwork Sun Jul 1 13:48:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 168414 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 82B132C01C0 for ; Sun, 1 Jul 2012 23:41:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932435Ab2GANlX (ORCPT ); Sun, 1 Jul 2012 09:41:23 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:49296 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932428Ab2GANlW (ORCPT ); Sun, 1 Jul 2012 09:41:22 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so6469492pbb.19 for ; Sun, 01 Jul 2012 06:41:22 -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=YRQRoi+82IS8cqC8hnM9A5+PSzukjqGKOROOiV15cdk=; b=l9Eqi1dzHt+JHSIuyL+ycXK5oUe/tb1k2Wr1wf5ZeoGSibNxE7iv14Wd9EzZ7HIQvp 8438K4K9INhvsTq+BfmLs+7FQAes+MuRWWSLyngODqNj0RrwzqzccnPPulB2euFejRRb //q5LWZaKw9bXWc5Ch4Q/VxjBdJ4ALNX+8gLlSewwrA18wdZlK0A7kE0ZeNm4xn0yGms brMfKm+3asIA2ZoMKdnQHqBdBTzJI4mzNTb8usJUjlaJOMcJuAiNMYyuaaz7vpQ9jiRk HIiof91MhKkbizMWCm/BayAcaW9KbXUVaDpZF2ai0sG4CNiN5WIqRWKLNQysiMS10qbh Mclg== Received: by 10.68.233.132 with SMTP id tw4mr21058743pbc.61.1341150082673; Sun, 01 Jul 2012 06:41:22 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ql3sm10544254pbc.72.2012.07.01.06.41.21 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 06:41:22 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 18/35 v3] debugfs: make rmdir cmd support inline data Date: Sun, 1 Jul 2012 21:48:41 +0800 Message-Id: <1341150538-32047-19-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1341150538-32047-1-git-send-email-wenqing.lz@taobao.com> References: <1341150538-32047-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/debugfs.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index db3d3b9..87fc6a9 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -1958,8 +1958,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;