projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
- patches.arch/x86_mce_intel_decode_physical_address.patch:
[linux-flexiantxendom0-3.2.10.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? */