From patchwork Sat Nov 30 11:28:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Filipe Manana X-Patchwork-Id: 3260161 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 816F29F1F4 for ; Sat, 30 Nov 2013 11:28:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95F7C205C2 for ; Sat, 30 Nov 2013 11:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB28820566 for ; Sat, 30 Nov 2013 11:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751624Ab3K3L2n (ORCPT ); Sat, 30 Nov 2013 06:28:43 -0500 Received: from mail-wg0-f44.google.com ([74.125.82.44]:47566 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119Ab3K3L2n (ORCPT ); Sat, 30 Nov 2013 06:28:43 -0500 Received: by mail-wg0-f44.google.com with SMTP id a1so8367947wgh.35 for ; Sat, 30 Nov 2013 03:28:42 -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; bh=LgAZuoQWMJ+o7ZHI10JUwdaCzQHQv4mrtmfICO0OWa0=; b=JbUa8Z6AOAEjHTiIIj7zXtVCISOBDjc2JPzsIASUcS5HWffdC+whzAtf5hE7l8H7yg uwTKEzfUzUgoB7zXHCNUFKm1/2xlmpKDRfwix/IXX/+mzm3bZbjLyUFjie6OgNHLGebo 1WOu/cbLpa0Cac2UVN7hqXBNNFseFpz/b5COYVkCU2pxFl+STD+QabUw4J1PThEZ0LpS 1s8fteCjsB1+DrFmeKy/ZqQYUA8L37DfHGgc/82+z30/lHsP+/utdKztEiypjX0aAVKV XbiWcr5zd3b7ee3kVE3d4g49xZgF2bO7LAXcxC1NCdOE0oA4nYfIu5eSsgi/ylCyrAQv Zmzw== X-Received: by 10.194.119.106 with SMTP id kt10mr409521wjb.72.1385810922008; Sat, 30 Nov 2013 03:28:42 -0800 (PST) Received: from storm-desktop.lan (bl5-4-1.dsl.telepac.pt. [82.154.4.1]) by mx.google.com with ESMTPSA id ll10sm100921047wic.9.2013.11.30.03.28.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 30 Nov 2013 03:28:41 -0800 (PST) From: Filipe David Borba Manana To: linux-btrfs@vger.kernel.org Cc: Filipe David Borba Manana Subject: [PATCH] Btrfs: fix extent_map block_len after merging Date: Sat, 30 Nov 2013 11:28:35 +0000 Message-Id: <1385810915-2826-1-git-send-email-fdmanana@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When merging an extent_map with its right neighbor, increment its block_len with the neighbor's block_len. Signed-off-by: Filipe David Borba Manana --- fs/btrfs/extent_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index b60955d..996ad56b 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -255,7 +255,7 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) merge = rb_entry(rb, struct extent_map, rb_node); if (rb && mergable_maps(em, merge)) { em->len += merge->len; - em->block_len += merge->len; + em->block_len += merge->block_len; rb_erase(&merge->rb_node, &tree->map); merge->in_tree = 0; em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start;