From: Chris Samuel Subject: [PATCH] Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)) - generated by Coccinelle Date: Sun, 31 Oct 2010 00:14:25 +1100 Message-ID: <201010310014.30428.chris@csamuel.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1667967.rcY4P5jknh"; protocol="application/pgp-signature"; micalg=pgp-sha1 To: linux-btrfs@vger.kernel.org, Chris Mason Return-path: List-ID: --nextPart1667967.rcY4P5jknh Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch was generated using the Coccinelle scripts and btrfs code in v2.6.36-9657-g7a3f8fe. Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...)) The semantic patch that makes this change is available in scripts/coccinelle/api/err_cast.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Chris Samuel diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 454ca52..23cb8da 100644 =2D-- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -335,7 +335,7 @@ struct extent_map *lookup_extent_mapping(struct extent_= map_tree *tree, goto out; } if (IS_ERR(rb_node)) { =2D em =3D ERR_PTR(PTR_ERR(rb_node)); + em =3D ERR_CAST(rb_node); goto out; } em =3D rb_entry(rb_node, struct extent_map, rb_node); @@ -384,7 +384,7 @@ struct extent_map *search_extent_mapping(struct extent_= map_tree *tree, goto out; } if (IS_ERR(rb_node)) { =2D em =3D ERR_PTR(PTR_ERR(rb_node)); + em =3D ERR_CAST(rb_node); goto out; } em =3D rb_entry(rb_node, struct extent_map, rb_node); diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index ebe46c6..1bc7a0a 100644 =2D-- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -380,7 +380,7 @@ static struct dentry *get_default_root(struct super_blo= ck *sb, find_root: new_root =3D btrfs_read_fs_root_no_name(root->fs_info, &location); if (IS_ERR(new_root)) =2D return ERR_PTR(PTR_ERR(new_root)); + return ERR_CAST(new_root); =20 if (btrfs_root_refs(&new_root->root_item) =3D=3D 0) return ERR_PTR(-ENOENT); =2D-=20 Chris Samuel : http://www.csamuel.org/ : Melbourne, VIC This email may come with a PGP signature as a file. Do not panic. =46or more info see: http://en.wikipedia.org/wiki/OpenPGP --nextPart1667967.rcY4P5jknh Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEVAwUATMwaMY1yjaOTJg85AQIUCAf/TJSC+lKWfpaoM1sH2jM3dvUJeng2QRDg frEXlhoksdiJ9lBKC63NAp0FplHD7NSkkYpUH3QlJ2f/4WsQiiV9v3E7r9TASIuj 0I75IawPe0Q7FZbEB9et8P81zKDb9izclOANjv8qEnrxixGEm27ecDn0bTpmqZZc uHRILu78dfF6pyx72jFO3ox4mVg8LhPl9LO/Oz6+qR16WED6/5WdaY8bajfM9fK1 ws8xoLZ1PHkLfI/Z+Judu4mn5DNPJz847YTtDPaC8+fpozcZgwxzLILpMwedZADe 2zfMaES0i89P42KjN7JrFbjr2/5/+lMif3/w03scd3MBczR1ebwgsw== =n/Un -----END PGP SIGNATURE----- --nextPart1667967.rcY4P5jknh--