diff options
Diffstat (limited to 'fs/ceph/mds_client.c')
-rw-r--r-- | fs/ceph/mds_client.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index de8ba4a242ca..2b19da31a8b3 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
@@ -136,9 +136,9 @@ static int parse_reply_info_dir(void **p, void *end, | |||
136 | goto bad; | 136 | goto bad; |
137 | 137 | ||
138 | ceph_decode_need(p, end, sizeof(num) + 2, bad); | 138 | ceph_decode_need(p, end, sizeof(num) + 2, bad); |
139 | ceph_decode_32(p, num); | 139 | num = ceph_decode_32(p); |
140 | ceph_decode_8(p, info->dir_end); | 140 | info->dir_end = ceph_decode_8(p); |
141 | ceph_decode_8(p, info->dir_complete); | 141 | info->dir_complete = ceph_decode_8(p); |
142 | if (num == 0) | 142 | if (num == 0) |
143 | goto done; | 143 | goto done; |
144 | 144 | ||
@@ -160,7 +160,7 @@ static int parse_reply_info_dir(void **p, void *end, | |||
160 | while (num) { | 160 | while (num) { |
161 | /* dentry */ | 161 | /* dentry */ |
162 | ceph_decode_need(p, end, sizeof(u32)*2, bad); | 162 | ceph_decode_need(p, end, sizeof(u32)*2, bad); |
163 | ceph_decode_32(p, info->dir_dname_len[i]); | 163 | info->dir_dname_len[i] = ceph_decode_32(p); |
164 | ceph_decode_need(p, end, info->dir_dname_len[i], bad); | 164 | ceph_decode_need(p, end, info->dir_dname_len[i], bad); |
165 | info->dir_dname[i] = *p; | 165 | info->dir_dname[i] = *p; |
166 | *p += info->dir_dname_len[i]; | 166 | *p += info->dir_dname_len[i]; |
@@ -1791,10 +1791,10 @@ static void handle_forward(struct ceph_mds_client *mdsc, struct ceph_msg *msg) | |||
1791 | from_mds = le64_to_cpu(msg->hdr.src.name.num); | 1791 | from_mds = le64_to_cpu(msg->hdr.src.name.num); |
1792 | 1792 | ||
1793 | ceph_decode_need(&p, end, sizeof(u64)+2*sizeof(u32), bad); | 1793 | ceph_decode_need(&p, end, sizeof(u64)+2*sizeof(u32), bad); |
1794 | ceph_decode_64(&p, tid); | 1794 | tid = ceph_decode_64(&p); |
1795 | ceph_decode_32(&p, next_mds); | 1795 | next_mds = ceph_decode_32(&p); |
1796 | ceph_decode_32(&p, fwd_seq); | 1796 | fwd_seq = ceph_decode_32(&p); |
1797 | ceph_decode_8(&p, must_resend); | 1797 | must_resend = ceph_decode_8(&p); |
1798 | 1798 | ||
1799 | WARN_ON(must_resend); /* shouldn't happen. */ | 1799 | WARN_ON(must_resend); /* shouldn't happen. */ |
1800 | 1800 | ||
@@ -2783,8 +2783,8 @@ void ceph_mdsc_handle_map(struct ceph_mds_client *mdsc, struct ceph_msg *msg) | |||
2783 | pr_err("got mdsmap with wrong fsid\n"); | 2783 | pr_err("got mdsmap with wrong fsid\n"); |
2784 | return; | 2784 | return; |
2785 | } | 2785 | } |
2786 | ceph_decode_32(&p, epoch); | 2786 | epoch = ceph_decode_32(&p); |
2787 | ceph_decode_32(&p, maplen); | 2787 | maplen = ceph_decode_32(&p); |
2788 | dout("handle_map epoch %u len %d\n", epoch, (int)maplen); | 2788 | dout("handle_map epoch %u len %d\n", epoch, (int)maplen); |
2789 | 2789 | ||
2790 | /* do we need it? */ | 2790 | /* do we need it? */ |