From patchwork Sun Jul 1 13:48: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: 168424 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 18CF32C01C0 for ; Sun, 1 Jul 2012 23:41:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932445Ab2GANlm (ORCPT ); Sun, 1 Jul 2012 09:41:42 -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 S932441Ab2GANll (ORCPT ); Sun, 1 Jul 2012 09:41:41 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so6469492pbb.19 for ; Sun, 01 Jul 2012 06:41:41 -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=wOOhO1wqN8WMU+MN3Q1AQtPe0nERXqQ4/jU3I7EgMHw=; b=sykyT9qiCHzx48ccKegWpD8NJYj37f436ypU65FvbJjyrjuQDe8iFgIbTFcdc40dSc QaxhwBA2BW9gCZZfJ7Dpn+FWca9ilj/0xqsAZbZe1wixrpK077eC/5/snf8Vf6RGxQor sApgXNnwZXUec1JAl1WsXxGwE/G3AOrL6oh/EqkK8ltZJfEZGH4ad/ao5UQwO/9aTpLA JsXG37ZYFZbOBRrarJHH4qiZcLEpsVRP3Ujx7bHyOXjQgA9c2Rv7biHBhwGrYDIE3QYj DTF4/aXR+CGcvBDr0OejNYtC70/sKlp0YPMWU6MBw/NqbLXnf8Ve5vTwYrlLYx7bS8sJ CREA== Received: by 10.66.76.103 with SMTP id j7mr14284986paw.60.1341150101483; Sun, 01 Jul 2012 06:41:41 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ql3sm10544254pbc.72.2012.07.01.06.41.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 06:41:41 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu Subject: [PATCH 28/35 v3] debugfs: make punch/truncate cmd support inline data Date: Sun, 1 Jul 2012 21:48:51 +0800 Message-Id: <1341150538-32047-29-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 If inode includes inline_data flag, start and end arguments will be ignored. Meanwhile we truncate inline data. Signed-off-by: Zheng Liu --- lib/ext2fs/punch.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c index b53653a..28967a4 100644 --- a/lib/ext2fs/punch.c +++ b/lib/ext2fs/punch.c @@ -281,6 +281,34 @@ errout: ext2fs_extent_free(handle); return retval; } + +static errcode_t ext2fs_punch_inline_data(ext2_filsys fs, ext2_ino_t ino, + struct ext2_inode *inode, + blk64_t start, blk64_t end) +{ + struct ext2_inode_large large_inode; + struct inline_data idata; + errcode_t retval; + int inline_size; + + retval = ext2fs_read_inode_full(fs, ino, (void *)&large_inode, + EXT2_INODE_SIZE(fs->super)); + if (retval) + return retval; + + ext2fs_iget_extra_inode(fs, &large_inode, &idata); + + inline_size = idata.inline_size; + retval = inline_data_destory_data(fs, ino, &large_inode, &idata); + if (retval) + return retval; + + large_inode.i_size = 0; + ext2fs_write_inode_full(fs, ino, (void *)&large_inode, + EXT2_INODE_SIZE(fs->super)); + + return retval; +} /* * Deallocate all logical blocks starting at start to end, inclusive. @@ -307,7 +335,10 @@ extern errcode_t ext2fs_punch(ext2_filsys fs, ext2_ino_t ino, return retval; inode = &inode_buf; } - if (inode->i_flags & EXT4_EXTENTS_FL) + if (inode->i_flags & EXT4_INLINE_DATA_FL) { + retval = ext2fs_punch_inline_data(fs, ino, inode, start, end); + return retval; + } else if (inode->i_flags & EXT4_EXTENTS_FL) retval = ext2fs_punch_extent(fs, ino, inode, start, end); else { blk_t count;