From patchwork Sun Jul 1 13:48:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 168412 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 40B972C01C0 for ; Sun, 1 Jul 2012 23:41:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932426Ab2GANlT (ORCPT ); Sun, 1 Jul 2012 09:41:19 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:36672 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932428Ab2GANlT (ORCPT ); Sun, 1 Jul 2012 09:41:19 -0400 Received: by mail-pz0-f46.google.com with SMTP id y13so6319540dad.19 for ; Sun, 01 Jul 2012 06:41:19 -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=wwM1PdvSqRyqjxuH3DnH3YipGcYYiN4k/OEIuSJlzEM0Atrn5guAWfokTrXOqidC+H lJImB6Jp2KZbNNHo1KN2dL6HNRZVUAKQMjeQsO/PDCeu8TRHOvZcerc4LVhfDTpymz8e 27hDRN0tpYMJUKtPv40FuATVUtqnlS+sswZxNHDqF58bwxk9T2rQe/e6TAX6ybI8kkfJ LO30Yv5OvOnlFjdLiigw18R6yd9ZnBvXANquyP2AMxz0ectdAGLRFR86Y5NbNqWAEGFb BpG32LxynlulZfodXBrl6ukJ1biT6Np8Bh8iKESfoJ7CFeawGWZKO1Bp3oseXvq075Xl YaUg== Received: by 10.68.225.170 with SMTP id rl10mr22536920pbc.13.1341150079104; Sun, 01 Jul 2012 06:41:19 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ql3sm10544254pbc.72.2012.07.01.06.41.17 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 06:41:18 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 16/35 v3] debugfs: make unlink cmd support inline data Date: Sun, 1 Jul 2012 21:48:39 +0800 Message-Id: <1341150538-32047-17-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 --- 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;