projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://www.jni.nu/cris
[deliverable/linux.git]
/
fs
/
btrfs
/
extent_map.c
diff --git
a/fs/btrfs/extent_map.c
b/fs/btrfs/extent_map.c
index 454ca52d6451b649b78b48cba908f3fd1eb2bada..23cb8da3ff6633dd83ba0b4cb435e8f742ad0632 100644
(file)
--- 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)) {
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);
goto out;
}
em = 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)) {
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);
goto out;
}
em = rb_entry(rb_node, struct extent_map, rb_node);
This page took
0.024008 seconds
and
5
git commands to generate.