git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fs/ceph: Use ERR_CAST
[pandora-kernel.git]
/
fs
/
ceph
/
osdmap.c
diff --git
a/fs/ceph/osdmap.c
b/fs/ceph/osdmap.c
index
cfdd8f4
..
ddc656f
100644
(file)
--- a/
fs/ceph/osdmap.c
+++ b/
fs/ceph/osdmap.c
@@
-706,7
+706,7
@@
struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
len, *p, end);
newcrush = crush_decode(*p, min(*p+len, end));
if (IS_ERR(newcrush))
- return ERR_
PTR(PTR_ERR(newcrush)
);
+ return ERR_
CAST(newcrush
);
}
/* new flags? */