diff options
| author | Sage Weil <sage@newdream.net> | 2010-02-25 19:40:07 -0500 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-02-26 13:02:03 -0500 |
| commit | 080af17e9c6360c5a835528e8de3141a46273ed2 (patch) | |
| tree | d3e0104bf7ca217ddd938f367de3f4237e14b639 | |
| parent | c99eb1c7263a44e63161a041a778b345b5cf0b6a (diff) | |
ceph: remove bogus mds forward warning
The must_resend flag is always true, not false. In any case, we can
just ignore it anyway.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/mds_client.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index bec8a7aeb300..a2600101ec22 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c | |||
| @@ -1899,7 +1899,6 @@ static void handle_forward(struct ceph_mds_client *mdsc, | |||
| 1899 | u64 tid = le64_to_cpu(msg->hdr.tid); | 1899 | u64 tid = le64_to_cpu(msg->hdr.tid); |
| 1900 | u32 next_mds; | 1900 | u32 next_mds; |
| 1901 | u32 fwd_seq; | 1901 | u32 fwd_seq; |
| 1902 | u8 must_resend; | ||
| 1903 | int err = -EINVAL; | 1902 | int err = -EINVAL; |
| 1904 | void *p = msg->front.iov_base; | 1903 | void *p = msg->front.iov_base; |
| 1905 | void *end = p + msg->front.iov_len; | 1904 | void *end = p + msg->front.iov_len; |
| @@ -1907,14 +1906,11 @@ static void handle_forward(struct ceph_mds_client *mdsc, | |||
| 1907 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); | 1906 | ceph_decode_need(&p, end, 2*sizeof(u32), bad); |
| 1908 | next_mds = ceph_decode_32(&p); | 1907 | next_mds = ceph_decode_32(&p); |
| 1909 | fwd_seq = ceph_decode_32(&p); | 1908 | fwd_seq = ceph_decode_32(&p); |
| 1910 | must_resend = ceph_decode_8(&p); | ||
| 1911 | |||
| 1912 | WARN_ON(must_resend); /* shouldn't happen. */ | ||
| 1913 | 1909 | ||
| 1914 | mutex_lock(&mdsc->mutex); | 1910 | mutex_lock(&mdsc->mutex); |
| 1915 | req = __lookup_request(mdsc, tid); | 1911 | req = __lookup_request(mdsc, tid); |
| 1916 | if (!req) { | 1912 | if (!req) { |
| 1917 | dout("forward %llu dne\n", tid); | 1913 | dout("forward %llu to mds%d - req dne\n", tid, next_mds); |
| 1918 | goto out; /* dup reply? */ | 1914 | goto out; /* dup reply? */ |
| 1919 | } | 1915 | } |
| 1920 | 1916 | ||
