Patchwork [19/32] debugfs: make rm and kill_file cmd support inline data

login
register
mail settings
Submitter Zheng Liu
Date April 16, 2012, 11:39 a.m.
Message ID <1334576407-4007-20-git-send-email-wenqing.lz@taobao.com>
Download mbox | patch
Permalink /patch/152803/
State Superseded
Headers show

Comments

Zheng Liu - April 16, 2012, 11:39 a.m.
From: Zheng Liu <wenqing.lz@taobao.com>

rm and kill_file command don't need to release blocks.

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
---
 debugfs/debugfs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 7a97c48..517751f 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -1841,8 +1841,9 @@  static void kill_file_by_inode(ext2_ino_t inode)
 	if (!ext2fs_inode_has_valid_blocks2(current_fs, &inode_buf))
 		return;
 
-	ext2fs_block_iterate3(current_fs, inode, BLOCK_FLAG_READ_ONLY, NULL,
-			      release_blocks_proc, NULL);
+	if (!ext2fs_has_inline_data(current_fs, inode))
+		ext2fs_block_iterate3(current_fs, inode, BLOCK_FLAG_READ_ONLY,
+				      NULL, release_blocks_proc, NULL);
 	printf("\n");
 	ext2fs_inode_alloc_stats2(current_fs, inode, -1,
 				  LINUX_S_ISDIR(inode_buf.i_mode));