diff options
Diffstat (limited to 'fs/ceph/osd_client.c')
| -rw-r--r-- | fs/ceph/osd_client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index 8e33928647f4..bbd9a5d23712 100644 --- a/fs/ceph/osd_client.c +++ b/fs/ceph/osd_client.c | |||
| @@ -894,8 +894,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) | |||
| 894 | dout(" %d inc maps\n", nr_maps); | 894 | dout(" %d inc maps\n", nr_maps); |
| 895 | while (nr_maps > 0) { | 895 | while (nr_maps > 0) { |
| 896 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); | 896 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); |
| 897 | ceph_decode_32(&p, epoch); | 897 | epoch = ceph_decode_32(&p); |
| 898 | ceph_decode_32(&p, maplen); | 898 | maplen = ceph_decode_32(&p); |
| 899 | ceph_decode_need(&p, end, maplen, bad); | 899 | ceph_decode_need(&p, end, maplen, bad); |
| 900 | next = p + maplen; | 900 | next = p + maplen; |
| 901 | if (osdc->osdmap && osdc->osdmap->epoch+1 == epoch) { | 901 | if (osdc->osdmap && osdc->osdmap->epoch+1 == epoch) { |
| @@ -927,8 +927,8 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) | |||
| 927 | dout(" %d full maps\n", nr_maps); | 927 | dout(" %d full maps\n", nr_maps); |
| 928 | while (nr_maps) { | 928 | while (nr_maps) { |
| 929 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); | 929 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); |
| 930 | ceph_decode_32(&p, epoch); | 930 | epoch = ceph_decode_32(&p); |
| 931 | ceph_decode_32(&p, maplen); | 931 | maplen = ceph_decode_32(&p); |
| 932 | ceph_decode_need(&p, end, maplen, bad); | 932 | ceph_decode_need(&p, end, maplen, bad); |
| 933 | if (nr_maps > 1) { | 933 | if (nr_maps > 1) { |
| 934 | dout("skipping non-latest full map %u len %d\n", | 934 | dout("skipping non-latest full map %u len %d\n", |