From patchwork Sun Jul 1 13:48:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 168418 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 5BEA92C01C1 for ; Sun, 1 Jul 2012 23:41:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932437Ab2GANlb (ORCPT ); Sun, 1 Jul 2012 09:41:31 -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 S932428Ab2GANla (ORCPT ); Sun, 1 Jul 2012 09:41:30 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so6469492pbb.19 for ; Sun, 01 Jul 2012 06:41:30 -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=GMuyQGLhF9w/GPPZzu7iSYiQqdCMb+EO/P3KP+B7eKM=; b=DedcjahoJWWJq6QDi2KEWxIIQoi49UPeYgoxGcnSgTUOvN9grqP0DoXQr7dQkSl0sA nC8kANMQb56Y5AKqJMQixGuTl4EuUmk3oOu+PqoDS2zWqv5qehXvzGVUGkdMp+6TC/12 l5E4uO0PNVhXPGGgW3vWtZWt8LLlO63RVNMSl8SzRTZl5trKHqd8WWSKXMC/Fx6tOb9L qtD3LKB2HQvJ4YBoXeQWjBF+n6xuon7iW1gJdQuZ0ghRm355shCFfytVbVLNRs6owVcN dxo8NWL66P49uoCCBeFT4Dypq1WIyg7scd4YGzV6eOkDk2mDT+TK0CrjZtyLMJfQObOx kv7Q== Received: by 10.68.225.201 with SMTP id rm9mr21976513pbc.71.1341150089967; Sun, 01 Jul 2012 06:41:29 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ql3sm10544254pbc.72.2012.07.01.06.41.28 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 06:41:29 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 22/35 v3] debugfs: make lsdel cmd support inline data Date: Sun, 1 Jul 2012 21:48:45 +0800 Message-Id: <1341150538-32047-23-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/lsdel.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c index bed0ce6..ff283cd 100644 --- a/debugfs/lsdel.c +++ b/debugfs/lsdel.c @@ -141,15 +141,18 @@ void do_lsdel(int argc, char **argv) lsd.free_blocks = 0; lsd.bad_blocks = 0; - retval = ext2fs_block_iterate3(current_fs, ino, - BLOCK_FLAG_READ_ONLY, block_buf, - lsdel_proc, &lsd); - if (retval) { - com_err("ls_deleted_inodes", retval, - "while calling ext2fs_block_iterate2"); - goto next; + if (!ext2fs_has_inline_data(current_fs, ino)) { + retval = ext2fs_block_iterate3(current_fs, ino, + BLOCK_FLAG_READ_ONLY, block_buf, + lsdel_proc, &lsd); + if (retval) { + com_err("ls_deleted_inodes", retval, + "while calling ext2fs_block_iterate2"); + goto next; + } } - if (lsd.free_blocks && !lsd.bad_blocks) { + if (lsd.free_blocks && !lsd.bad_blocks || + ext2fs_has_inline_data(current_fs, ino)) { if (num_delarray >= max_delarray) { max_delarray += 50; delarray = realloc(delarray,