Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d0b678cb0a26783ab7238784f1e7e608e5caafa3

Authored by Julia Lawall
Committed by Chris Mason
1 parent 2354d08fe9
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Btrfs: Use ERR_CAST helpers 

Use ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)).  The former makes more
clear what is the purpose of the operation, which otherwise looks like a
no-op.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
type T;
T x;
identifier f;
@@

T f (...) { <+...
- ERR_PTR(PTR_ERR(x))
+ x
 ...+> }

@@
expression x;
@@

- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

fs/btrfs/extent_map.c
Diff comments   View file @ d0b678c
... ... @@ -335,7 +335,7 @@
335 335 goto out;
336 336 }
337 337 if (IS_ERR(rb_node)) {
338   - em = ERR_PTR(PTR_ERR(rb_node));
  338 + em = ERR_CAST(rb_node);
339 339 goto out;
340 340 }
341 341 em = rb_entry(rb_node, struct extent_map, rb_node);
... ... @@ -384,7 +384,7 @@
384 384 goto out;
385 385 }
386 386 if (IS_ERR(rb_node)) {
387   - em = ERR_PTR(PTR_ERR(rb_node));
  387 + em = ERR_CAST(rb_node);
388 388 goto out;
389 389 }
390 390 em = rb_entry(rb_node, struct extent_map, rb_node);
... ... @@ -389,7 +389,7 @@
389 389 find_root:
390 390 new_root = btrfs_read_fs_root_no_name(root->fs_info, &location);
391 391 if (IS_ERR(new_root))
392   - return ERR_PTR(PTR_ERR(new_root));
  392 + return ERR_CAST(new_root);
393 393  
394 394 if (btrfs_root_refs(&new_root->root_item) == 0)
395 395 return ERR_PTR(-ENOENT);