diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:50 +0800 |
commit | 864b6e70253ae07b58bb126d29a35be22f50f453 (patch) | |
tree | 21f2021685284c01035f1cf03c1ff0b3c66da008 /net/ceph | |
parent | 405b4c1452cb59ce07632a60d3e3152ab9243ae6 (diff) | |
parent | 421a8ddd1fc901897eee73965b442af4b4dd7095 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.03-android
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/messenger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 56a65536c8f1..1519051603ff 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2287,7 +2287,7 @@ static int read_partial_message(struct ceph_connection *con) con->in_base_pos = -front_len - middle_len - data_len - sizeof(m->footer); con->in_tag = CEPH_MSGR_TAG_READY; - return 0; + return 1; } else if ((s64)seq - (s64)con->in_seq > 1) { pr_err("read_partial_message bad seq %lld expected %lld\n", seq, con->in_seq + 1); @@ -2320,7 +2320,7 @@ static int read_partial_message(struct ceph_connection *con) sizeof(m->footer); con->in_tag = CEPH_MSGR_TAG_READY; con->in_seq++; - return 0; + return 1; } BUG_ON(!con->in_msg); |