From patchwork Sat May 22 10:00:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 101626 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4MA2Bko013992 for ; Sat, 22 May 2010 10:02:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754204Ab0EVKBE (ORCPT ); Sat, 22 May 2010 06:01:04 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:53908 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753417Ab0EVKBB (ORCPT ); Sat, 22 May 2010 06:01:01 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id CAE8652C457; Sat, 22 May 2010 12:01:00 +0200 (CEST) Received: from mgw1.diku.dk ([127.0.0.1]) by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 635niC1kO0ty; Sat, 22 May 2010 12:00:56 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id 6CB8F52C51A; Sat, 22 May 2010 12:00:38 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 598866DFD17; Sat, 22 May 2010 11:53:18 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 52F2E200BD; Sat, 22 May 2010 12:00:38 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 48749200BB; Sat, 22 May 2010 12:00:38 +0200 (CEST) Date: Sat, 22 May 2010 12:00:38 +0200 (CEST) From: Julia Lawall To: Chris Mason , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 5/8] fs/btrfs: Use ERR_CAST Message-ID: MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 22 May 2010 10:02:11 +0000 (UTC) diff -u -p a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -335,7 +335,7 @@ struct extent_map *lookup_extent_mapping goto out; } if (IS_ERR(rb_node)) { - em = ERR_PTR(PTR_ERR(rb_node)); + em = ERR_CAST(rb_node); goto out; } em = rb_entry(rb_node, struct extent_map, rb_node); @@ -384,7 +384,7 @@ struct extent_map *search_extent_mapping goto out; } if (IS_ERR(rb_node)) { - em = ERR_PTR(PTR_ERR(rb_node)); + em = ERR_CAST(rb_node); goto out; } em = rb_entry(rb_node, struct extent_map, rb_node); diff -u -p a/fs/btrfs/super.c b/fs/btrfs/super.c --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -378,7 +378,7 @@ static struct dentry *get_default_root(s find_root: new_root = btrfs_read_fs_root_no_name(root->fs_info, &location); if (IS_ERR(new_root)) - return ERR_PTR(PTR_ERR(new_root)); + return ERR_CAST(new_root); if (btrfs_root_refs(&new_root->root_item) == 0) return ERR_PTR(-ENOENT);