From patchwork Mon Apr 16 11:39:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 152800 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 13AABB6FAA for ; Mon, 16 Apr 2012 21:34:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277Ab2DPLeX (ORCPT ); Mon, 16 Apr 2012 07:34:23 -0400 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 S1753030Ab2DPLeW (ORCPT ); Mon, 16 Apr 2012 07:34:22 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so6233785pbc.19 for ; Mon, 16 Apr 2012 04:34: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=bpHbJaTdraDqrYuGLp1vTOQXClx9tL7wD9TW6vLcpt8=; b=EIf045s1nEog1lQZjgiHKOrQl/4DFBES69MmS4J4pbNBKRi2pPihZxSoEisTOgmufB pFL4qjmSLiC4Exar9g6sFvI3NvX/fxkQREZPfcOuw33tux1Ifz8WtZnqlUzkWGMFNXPm R0P+QO4XsN5yOMZY3yX6b6JC1emkTFIbcN0Mp+LRdplHPlq8CCidX/BKT39JddiE0c9i LFMKjDqlsxMkRP77g837NTZ/0w3OLPISaCzH8pfeQLpq0cKT7w+9KlQUFlfNu5gUsOV9 0n3XyGNTo3DcuvkgeOotlG8O5eA2JRseWdlADLieUr5dMB6180uGJ/9LUIT5pipzcZjG F6oA== Received: by 10.68.194.227 with SMTP id hz3mr27965266pbc.23.1334576062577; Mon, 16 Apr 2012 04:34:22 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id l6sm17474160pbp.33.2012.04.16.04.34.20 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Apr 2012 04:34:22 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 16/32] debugfs: make unlink cmd support inline data Date: Mon, 16 Apr 2012 19:39:51 +0800 Message-Id: <1334576407-4007-17-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 --- lib/ext2fs/unlink.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/ext2fs/unlink.c b/lib/ext2fs/unlink.c index d2d31cc..6852d4a 100644 --- a/lib/ext2fs/unlink.c +++ b/lib/ext2fs/unlink.c @@ -90,8 +90,13 @@ errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, ls.done = 0; ls.prev = 0; - retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY, - 0, unlink_proc, &ls); + if (ext2fs_has_inline_data(fs, dir)) + retval = ext2fs_inline_data_iterate(fs, dir, + DIRENT_FLAG_INCLUDE_EMPTY, 0, + unlink_proc, &ls); + else + retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY, + 0, unlink_proc, &ls); if (retval) return retval;