android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libceph: osd_state is 32 bits wide in luminous

Browse Source 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2017-06-22 19:44:06 +02:00
parent 9eebe45c09
commit 0bb05da2ec
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/ceph/osdmap.h
View File

@ -162,7 +162,7 @@ struct ceph_osdmap {
u32 flags; /* CEPH_OSDMAP_* */ u32 flags; /* CEPH_OSDMAP_* */
u32 max_osd; /* size of osd_state, _offload, _addr arrays */ u32 max_osd; /* size of osd_state, _offload, _addr arrays */
u8 *osd_state; /* CEPH_OSD_* */ u32 *osd_state; /* CEPH_OSD_* */
u32 *osd_weight; /* 0 = failed, 0x10000 = 100% normal */ u32 *osd_weight; /* 0 = failed, 0x10000 = 100% normal */
struct ceph_entity_addr *osd_addr; struct ceph_entity_addr *osd_addr;
@ -203,7 +203,7 @@ static inline bool ceph_osd_is_down(struct ceph_osdmap *map, int osd)
return !ceph_osd_is_up(map, osd); return !ceph_osd_is_up(map, osd);
} }
extern char *ceph_osdmap_state_str(char *str, int len, int state); char *ceph_osdmap_state_str(char *str, int len, u32 state);
extern u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd); extern u32 ceph_get_primary_affinity(struct ceph_osdmap *map, int osd);
static inline struct ceph_entity_addr *ceph_osd_addr(struct ceph_osdmap *map, static inline struct ceph_entity_addr *ceph_osd_addr(struct ceph_osdmap *map,

2
net/ceph/debugfs.c
View File

@ -77,7 +77,7 @@ static int osdmap_show(struct seq_file *s, void *p)
} }
for (i = 0; i < map->max_osd; i++) { for (i = 0; i < map->max_osd; i++) {
struct ceph_entity_addr *addr = &map->osd_addr[i]; struct ceph_entity_addr *addr = &map->osd_addr[i];
int state = map->osd_state[i]; u32 state = map->osd_state[i];
char sb[64]; char sb[64];
seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\n", seq_printf(s, "osd%d\t%s\t%3d%%\t(%s)\t%3d%%\n",

29
net/ceph/osdmap.c
View File

@ -11,7 +11,7 @@
#include <linux/crush/hash.h> #include <linux/crush/hash.h>
#include <linux/crush/mapper.h> #include <linux/crush/mapper.h>
char *ceph_osdmap_state_str(char *str, int len, int state) char *ceph_osdmap_state_str(char *str, int len, u32 state)
{ {
if (!len) if (!len)
return str; return str;
@ -984,7 +984,7 @@ void ceph_osdmap_destroy(struct ceph_osdmap *map)
*/ */
static int osdmap_set_max_osd(struct ceph_osdmap *map, int max) static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
{ {
u8 *state; u32 *state;
u32 *weight; u32 *weight;
struct ceph_entity_addr *addr; struct ceph_entity_addr *addr;
int i; int i;
@ -1484,13 +1484,21 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map)
/* osd_state, osd_weight, osd_addrs->client_addr */ /* osd_state, osd_weight, osd_addrs->client_addr */
ceph_decode_need(p, end, 3*sizeof(u32) + ceph_decode_need(p, end, 3*sizeof(u32) +
map->max_osd*(1 + sizeof(*map->osd_weight) + map->max_osd*((struct_v >= 5 ? sizeof(u32) :
sizeof(u8)) +
sizeof(*map->osd_weight) +
sizeof(*map->osd_addr)), e_inval); sizeof(*map->osd_addr)), e_inval);
if (ceph_decode_32(p) != map->max_osd) if (ceph_decode_32(p) != map->max_osd)
goto e_inval; goto e_inval;
ceph_decode_copy(p, map->osd_state, map->max_osd); if (struct_v >= 5) {
for (i = 0; i < map->max_osd; i++)
map->osd_state[i] = ceph_decode_32(p);
} else {
for (i = 0; i < map->max_osd; i++)
map->osd_state[i] = ceph_decode_8(p);
}
if (ceph_decode_32(p) != map->max_osd) if (ceph_decode_32(p) != map->max_osd)
goto e_inval; goto e_inval;
@ -1598,7 +1606,7 @@ struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end)
* new_up_client: { osd=6, addr=... } # set osd_state and addr * new_up_client: { osd=6, addr=... } # set osd_state and addr
* new_state: { osd=6, xorstate=EXISTS } # clear osd_state * new_state: { osd=6, xorstate=EXISTS } # clear osd_state
*/ */
static int decode_new_up_state_weight(void **p, void *end, static int decode_new_up_state_weight(void **p, void *end, u8 struct_v,
struct ceph_osdmap *map) struct ceph_osdmap *map)
{ {
void *new_up_client; void *new_up_client;
@ -1614,7 +1622,7 @@ static int decode_new_up_state_weight(void **p, void *end,
new_state = *p; new_state = *p;
ceph_decode_32_safe(p, end, len, e_inval); ceph_decode_32_safe(p, end, len, e_inval);
len *= sizeof(u32) + sizeof(u8); len *= sizeof(u32) + (struct_v >= 5 ? sizeof(u32) : sizeof(u8));
ceph_decode_need(p, end, len, e_inval); ceph_decode_need(p, end, len, e_inval);
*p += len; *p += len;
@ -1650,11 +1658,14 @@ static int decode_new_up_state_weight(void **p, void *end,
len = ceph_decode_32(p); len = ceph_decode_32(p);
while (len--) { while (len--) {
s32 osd; s32 osd;
u8 xorstate; u32 xorstate;
int ret; int ret;
osd = ceph_decode_32(p); osd = ceph_decode_32(p);
xorstate = ceph_decode_8(p); if (struct_v >= 5)
xorstate = ceph_decode_32(p);
else
xorstate = ceph_decode_8(p);
if (xorstate == 0) if (xorstate == 0)
xorstate = CEPH_OSD_UP; xorstate = CEPH_OSD_UP;
BUG_ON(osd >= map->max_osd); BUG_ON(osd >= map->max_osd);
@ -1788,7 +1799,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
} }
/* new_up_client, new_state, new_weight */ /* new_up_client, new_state, new_weight */
err = decode_new_up_state_weight(p, end, map); err = decode_new_up_state_weight(p, end, struct_v, map);
if (err) if (err)
goto bad; goto bad;