From patchwork Fri Jan 31 16:42:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 3562731 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7C8CCC02DC for ; Fri, 31 Jan 2014 16:42:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AAFE82022A for ; Fri, 31 Jan 2014 16:42:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9398E2021C for ; Fri, 31 Jan 2014 16:42:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932621AbaAaQmW (ORCPT ); Fri, 31 Jan 2014 11:42:22 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:59851 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932281AbaAaQmV (ORCPT ); Fri, 31 Jan 2014 11:42:21 -0500 Received: by mail-pa0-f42.google.com with SMTP id kl14so4651992pab.1 for ; Fri, 31 Jan 2014 08:42:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=/ciRURIalfAMXjqRslS6MhGkRZDFK6Yt4/JUYdKC+YU=; b=n4Su9PO25ykqjDHm7PLcYqZSLT6iigVJb55qAM4LTHSjjWk8BsyWUPz7kdmSpdKuYG lbYsMXaKVq5UWsw0I/Z4auTPZf3umddYSveE1rzI7sQkw8lrJpfKg2b5nr/gNjgxCOA9 7nCSSMq3l4fE7T7EuCV+zxOxsWLAwsAhnrkfJSUi0FQZ3Pr1RdlXPeQu2b/ezolaOv1K YGMBHiiqLB0U0tsRGsdjxIXiVqTI5sELi47DX76JH6MMi7AHjsp3bikZ11qPtXu/e8O/ rMgflrpMe5yr8i8ZBeKWRQrh43313KTF1+CVkinSHYCwLtx/VbhugoKppQ+b0TH3EUE7 midQ== X-Received: by 10.68.184.194 with SMTP id ew2mr21856631pbc.100.1391186540813; Fri, 31 Jan 2014 08:42:20 -0800 (PST) Received: from linux-b0ol.localdomain ([36.59.228.44]) by mx.google.com with ESMTPSA id om6sm29181142pbc.43.2014.01.31.08.42.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2014 08:42:20 -0800 (PST) From: Wang Shilong To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/2] Btrfs: switch to btrfs_previous_extent_item() Date: Sat, 1 Feb 2014 00:42:04 +0800 Message-Id: <1391186525-2965-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.8.4 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.4 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 From: Wang Shilong Since we have introduced btrfs_previous_extent_item() to search previous extent item, just switch into it. Signed-off-by: Wang Shilong --- fs/btrfs/backref.c | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index aded3ef..4f59f07 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1333,37 +1333,9 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, if (ret < 0) return ret; - while (1) { - u32 nritems; - if (path->slots[0] == 0) { - btrfs_set_path_blocking(path); - ret = btrfs_prev_leaf(fs_info->extent_root, path); - if (ret != 0) { - if (ret > 0) { - pr_debug("logical %llu is not within " - "any extent\n", logical); - ret = -ENOENT; - } - return ret; - } - } else { - path->slots[0]--; - } - nritems = btrfs_header_nritems(path->nodes[0]); - if (nritems == 0) { - pr_debug("logical %llu is not within any extent\n", - logical); - return -ENOENT; - } - if (path->slots[0] == nritems) - path->slots[0]--; - - btrfs_item_key_to_cpu(path->nodes[0], found_key, - path->slots[0]); - if (found_key->type == BTRFS_EXTENT_ITEM_KEY || - found_key->type == BTRFS_METADATA_ITEM_KEY) - break; - } + ret = btrfs_previous_extent_item(fs_info->extent_root, path, 0); + if (ret) + return ret; if (found_key->type == BTRFS_METADATA_ITEM_KEY) size = fs_info->extent_root->leafsize;