diff options
Diffstat (limited to 'net/ceph/osdmap.c')
-rw-r--r-- | net/ceph/osdmap.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index ec4d9e24dcf9..b8c3fde5b04f 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c | |||
@@ -521,11 +521,11 @@ static int decode_pool(void **p, void *end, struct ceph_pg_pool_info *pi) | |||
521 | ev = ceph_decode_8(p); /* encoding version */ | 521 | ev = ceph_decode_8(p); /* encoding version */ |
522 | cv = ceph_decode_8(p); /* compat version */ | 522 | cv = ceph_decode_8(p); /* compat version */ |
523 | if (ev < 5) { | 523 | if (ev < 5) { |
524 | pr_warning("got v %d < 5 cv %d of ceph_pg_pool\n", ev, cv); | 524 | pr_warn("got v %d < 5 cv %d of ceph_pg_pool\n", ev, cv); |
525 | return -EINVAL; | 525 | return -EINVAL; |
526 | } | 526 | } |
527 | if (cv > 9) { | 527 | if (cv > 9) { |
528 | pr_warning("got v %d cv %d > 9 of ceph_pg_pool\n", ev, cv); | 528 | pr_warn("got v %d cv %d > 9 of ceph_pg_pool\n", ev, cv); |
529 | return -EINVAL; | 529 | return -EINVAL; |
530 | } | 530 | } |
531 | len = ceph_decode_32(p); | 531 | len = ceph_decode_32(p); |
@@ -729,9 +729,9 @@ static int get_osdmap_client_data_v(void **p, void *end, | |||
729 | 729 | ||
730 | ceph_decode_8_safe(p, end, struct_compat, e_inval); | 730 | ceph_decode_8_safe(p, end, struct_compat, e_inval); |
731 | if (struct_compat > OSDMAP_WRAPPER_COMPAT_VER) { | 731 | if (struct_compat > OSDMAP_WRAPPER_COMPAT_VER) { |
732 | pr_warning("got v %d cv %d > %d of %s ceph_osdmap\n", | 732 | pr_warn("got v %d cv %d > %d of %s ceph_osdmap\n", |
733 | struct_v, struct_compat, | 733 | struct_v, struct_compat, |
734 | OSDMAP_WRAPPER_COMPAT_VER, prefix); | 734 | OSDMAP_WRAPPER_COMPAT_VER, prefix); |
735 | return -EINVAL; | 735 | return -EINVAL; |
736 | } | 736 | } |
737 | *p += 4; /* ignore wrapper struct_len */ | 737 | *p += 4; /* ignore wrapper struct_len */ |
@@ -739,9 +739,9 @@ static int get_osdmap_client_data_v(void **p, void *end, | |||
739 | ceph_decode_8_safe(p, end, struct_v, e_inval); | 739 | ceph_decode_8_safe(p, end, struct_v, e_inval); |
740 | ceph_decode_8_safe(p, end, struct_compat, e_inval); | 740 | ceph_decode_8_safe(p, end, struct_compat, e_inval); |
741 | if (struct_compat > OSDMAP_CLIENT_DATA_COMPAT_VER) { | 741 | if (struct_compat > OSDMAP_CLIENT_DATA_COMPAT_VER) { |
742 | pr_warning("got v %d cv %d > %d of %s ceph_osdmap client data\n", | 742 | pr_warn("got v %d cv %d > %d of %s ceph_osdmap client data\n", |
743 | struct_v, struct_compat, | 743 | struct_v, struct_compat, |
744 | OSDMAP_CLIENT_DATA_COMPAT_VER, prefix); | 744 | OSDMAP_CLIENT_DATA_COMPAT_VER, prefix); |
745 | return -EINVAL; | 745 | return -EINVAL; |
746 | } | 746 | } |
747 | *p += 4; /* ignore client data struct_len */ | 747 | *p += 4; /* ignore client data struct_len */ |
@@ -751,8 +751,8 @@ static int get_osdmap_client_data_v(void **p, void *end, | |||
751 | *p -= 1; | 751 | *p -= 1; |
752 | ceph_decode_16_safe(p, end, version, e_inval); | 752 | ceph_decode_16_safe(p, end, version, e_inval); |
753 | if (version < 6) { | 753 | if (version < 6) { |
754 | pr_warning("got v %d < 6 of %s ceph_osdmap\n", version, | 754 | pr_warn("got v %d < 6 of %s ceph_osdmap\n", |
755 | prefix); | 755 | version, prefix); |
756 | return -EINVAL; | 756 | return -EINVAL; |
757 | } | 757 | } |
758 | 758 | ||