From patchwork Mon Jan 27 06:48:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3541441 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 2E37FC02DC for ; Mon, 27 Jan 2014 06:58:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D05020131 for ; Mon, 27 Jan 2014 06:58:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBC8C20127 for ; Mon, 27 Jan 2014 06:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753636AbaA0G6d (ORCPT ); Mon, 27 Jan 2014 01:58:33 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:44834 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753626AbaA0G6a (ORCPT ); Mon, 27 Jan 2014 01:58:30 -0500 Received: by mail-pd0-f177.google.com with SMTP id x10so5343391pdj.22 for ; Sun, 26 Jan 2014 22:58:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ozZPL5A6yLEQtAjFZz5H7cnnYJGO0clq6e/44oEsmPQ=; b=RRBFuHk7hrJUEJQubYKnDHGKn8wZK6oqz8xGdCj3x7SYt1joymGI7KjNOCi9MXypBg uG5puuSki4I7bgPXzqt4/2/4CCsRwWRYD9JMwYlfZJjkLCJOEurRSlywAE9w9wjW5bNW LkHioKKtClUAA8AhLrFGdcNBxlDny5mVgVdsOV0dfGcldAuDN22Pl2OlYaMAfRarWrap NBaoAU5vfUMy09O66DA86cUa8in1KcRM8fKQkgd5RCizKltQUzyQ+MpqvhFdBY+Zr4dx 0ABz8+P9zE7sx5pgazfp11Rwamlz9lNtmhF0j7+Dn3lNl7eEMLYHVx7Pq5vmxnzOAaXH 7OHg== X-Gm-Message-State: ALoCoQlrme4PiinL+jeMg8pkNKLE0hwCFeeIBZb71obK3Z/+9xW/D/mWRVlRm+nwzfc9ur0Sug8k X-Received: by 10.66.159.233 with SMTP id xf9mr1459093pab.139.1390805574560; Sun, 26 Jan 2014 22:52:54 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id un5sm77645413pab.3.2014.01.26.22.52.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 26 Jan 2014 22:52:53 -0800 (PST) From: Sachin Kamat To: linux-btrfs@vger.kernel.org Cc: clm@fb.com, jbacik@fb.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/2] btrfs: Use PTR_ERR_OR_ZERO Date: Mon, 27 Jan 2014 12:18:14 +0530 Message-Id: <1390805294-24617-1-git-send-email-sachin.kamat@linaro.org> 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=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 PTR_RET is deprecated. Use PTR_ERR_OR_ZERO instead. While at it also include missing err.h header. Signed-off-by: Sachin Kamat --- fs/btrfs/root-tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index 1389b69059de..38bb47e7d6b1 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -16,6 +16,7 @@ * Boston, MA 021110-1307, USA. */ +#include #include #include "ctree.h" #include "transaction.h" @@ -271,7 +272,7 @@ int btrfs_find_orphan_roots(struct btrfs_root *tree_root) key.offset++; root = btrfs_read_fs_root(tree_root, &root_key); - err = PTR_RET(root); + err = PTR_ERR_OR_ZERO(root); if (err && err != -ENOENT) { break; } else if (err == -ENOENT) {