From patchwork Tue Dec 3 12:11:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 296164 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 5EE6D2C009F for ; Tue, 3 Dec 2013 23:09:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753544Ab3LCMJb (ORCPT ); Tue, 3 Dec 2013 07:09:31 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:43447 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753430Ab3LCMJa (ORCPT ); Tue, 3 Dec 2013 07:09:30 -0500 Received: by mail-pa0-f41.google.com with SMTP id lf10so2891884pab.14 for ; Tue, 03 Dec 2013 04:09:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DJ3usRnVx1UV8SvYCZ3yoqzVJ0FYHkshOoiMqxT7tCQ=; b=lXMozx8wq6RAYBqmIDxG4cNCnky7W6bgYewP7USDUPAYQXV39SYXUkh4nWPZP1zxsP hrWc4hOh63T4ZJ2mo/03GNkveM19kqYmjDjmrtL0+wHk/+6IXamq/kpx5YnboIyfWxze RO8oyjFDEMkzmJtKKvcY9EMDBunf9g18MQ/yDhkfoaUxIfTLDRBXCYIWGRLifkwzB+l1 3gwMbpVKJtBFZeDGfn/zO7Ll5ZyLdBWcC58p0w5v8TUoRQlvaaNq3XC4PHBDN5LPIOc4 8I1mF15r4KJOuwrLHY0BOcQLl7sggrPAf4TmNOh2wwyNNhJuYQmWqxSZgBB5yvWSQ08J i9eA== X-Received: by 10.66.242.17 with SMTP id wm17mr75158234pac.102.1386072569516; Tue, 03 Dec 2013 04:09:29 -0800 (PST) Received: from alpha.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id xv2sm129628866pbb.39.2013.12.03.04.09.27 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 03 Dec 2013 04:09:29 -0800 (PST) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Theodore Ts'o , "Darrick J. Wong" , Zheng Liu Subject: [PATCH v2 10/28] libext2fs: handle inline_data in block iterator function Date: Tue, 3 Dec 2013 20:11:37 +0800 Message-Id: <1386072715-9869-11-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <1386072715-9869-1-git-send-email-wenqing.lz@taobao.com> References: <1386072715-9869-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 After applied this commit (a7f4c635), we have banned to traverse blocks for an inode which has inline data because no block belongs to it. But before calling this function, we need to check inline data flag. This commit add a sanity check ext2fs_inode_has_valid_blocks2() to fix them except that ext2fs_expand_dir because it will be fixed by another patch. Signed-off-by: Zheng Liu --- debugfs/filefrag.c | 12 +++++++----- debugfs/lsdel.c | 17 ++++++++++------- lib/ext2fs/valid_blk.c | 7 +++++++ misc/tune2fs.c | 3 ++- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/debugfs/filefrag.c b/debugfs/filefrag.c index e82d133..7a82e8d 100644 --- a/debugfs/filefrag.c +++ b/debugfs/filefrag.c @@ -154,11 +154,13 @@ static void filefrag(ext2_ino_t ino, struct ext2_inode *inode, fs->name, num_blocks, EXT2_I_SIZE(inode)); } print_header(fs); - retval = ext2fs_block_iterate3(current_fs, ino, - BLOCK_FLAG_READ_ONLY, NULL, - filefrag_blocks_proc, fs); - if (retval) - com_err("ext2fs_block_iterate3", retval, 0); + if (ext2fs_inode_has_valid_blocks2(current_fs, inode)) { + retval = ext2fs_block_iterate3(current_fs, ino, + BLOCK_FLAG_READ_ONLY, NULL, + filefrag_blocks_proc, fs); + if (retval) + com_err("ext2fs_block_iterate3", retval, 0); + } report_filefrag(fs); fprintf(fs->f, "%s: %d contiguous extents%s\n", fs->name, fs->ext, diff --git a/debugfs/lsdel.c b/debugfs/lsdel.c index bed0ce6..ba84611 100644 --- a/debugfs/lsdel.c +++ b/debugfs/lsdel.c @@ -141,13 +141,16 @@ 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_inode_has_valid_blocks2(current_fs, &inode)) { + 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 (num_delarray >= max_delarray) { diff --git a/lib/ext2fs/valid_blk.c b/lib/ext2fs/valid_blk.c index 895e36e..db5d90a 100644 --- a/lib/ext2fs/valid_blk.c +++ b/lib/ext2fs/valid_blk.c @@ -52,6 +52,13 @@ int ext2fs_inode_has_valid_blocks2(ext2_filsys fs, struct ext2_inode *inode) return 0; /* Probably a fast symlink */ } } + + /* + * If this inode has inline data, it shouldn't have valid block + * entries. + */ + if (inode->i_flags & EXT4_INLINE_DATA_FL) + return 0; return 1; } diff --git a/misc/tune2fs.c b/misc/tune2fs.c index 1ae0ee6..95c1886 100644 --- a/misc/tune2fs.c +++ b/misc/tune2fs.c @@ -688,7 +688,8 @@ static void rewrite_inodes(ext2_filsys fs) exit(1); } - if (LINUX_S_ISDIR(inode->i_mode)) { + if (LINUX_S_ISDIR(inode->i_mode) && + ext2fs_inode_has_valid_blocks2(fs, inode)) { retval = rewrite_directory(fs, ino, inode); if (retval) { com_err("rewrite_directory", retval,