From patchwork Fri Oct 28 17:00:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 122446 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 A5755B6F76 for ; Sat, 29 Oct 2011 04:00:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756081Ab1J1RAZ (ORCPT ); Fri, 28 Oct 2011 13:00:25 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:45611 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756079Ab1J1RAY (ORCPT ); Fri, 28 Oct 2011 13:00:24 -0400 Received: by mail-bw0-f46.google.com with SMTP id zt4so624020bkb.19 for ; Fri, 28 Oct 2011 10:00:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=myr/2kvd1mc6ZDz+CGEuvVjNO0rphA6PK5rysHx1Utg=; b=utBOQ7yef6kd37aCYrRL6XXPiGLgnOIheNoQXxW3tbPPUEOYNk5NKFTO3qas1PsiyF T8V38lD45H7umNxzvWfhQZWQcq/MdL9+Xz3DST/mhTXB/v2uPJdiuoDFKFWQEJOq5cw+ 8qzSAKU5CJHyshVtXAgq4v5kKZQYPwpUzfRE0= Received: by 10.204.130.208 with SMTP id u16mr3134042bks.47.1319821223468; Fri, 28 Oct 2011 10:00:23 -0700 (PDT) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id x8sm3655808bkv.10.2011.10.28.10.00.21 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Oct 2011 10:00:22 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: achender@linux.vnet.ibm.com, tytso@mit.edu, Dmitry Monakhov Subject: [PATCH 4/7] ext4: punch_hole fix extent conversion Date: Fri, 28 Oct 2011 21:00:07 +0400 Message-Id: <1319821210-7374-5-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1319821210-7374-1-git-send-email-dmonakhov@openvz.org> References: <1319821210-7374-1-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Currently punched extent converted to uninitialized incorrectly, in fact i'm not shure whenever we actually need that conversion, but if we do that let's do it right. Signed-off-by: Dmitry Monakhov --- fs/ext4/extents.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 02dfe38..0365173 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3275,8 +3275,15 @@ ext4_ext_handle_punched_extent(handle_t *handle, struct inode *inode, ex = path[path->p_depth].p_ext; } - ext4_ext_mark_uninitialized(ex); + err = ext4_ext_get_access(handle, inode, path + path->p_depth); + if (err) + goto out; ext4_ext_invalidate_cache(inode); + ext4_ext_mark_uninitialized(ex); + err = ext4_ext_dirty(handle, inode, path + path->p_depth); + if (err) + goto out; + err = ext4_ext_rm_leaf(handle, inode, path, &partial_cluster, map->m_lblk, map->m_lblk + punched_out); if (!err && ext4_ext_try_shrink(handle, inode))