Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil:
"There are two small messenger bug fixes and a log spam regression fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: don't spam dmesg with stray reply warnings
libceph: use the right footer size when skipping a message
libceph: don't bail early from try_read() when skipping a message
+13
-6
+11
-4
net/ceph/messenger.c
+11
-4
net/ceph/messenger.c
···
1197
1197
return new_piece;
1198
1198
}
1199
1199
1200
+
static size_t sizeof_footer(struct ceph_connection *con)
1201
+
{
1202
+
return (con->peer_features & CEPH_FEATURE_MSG_AUTH) ?
1203
+
sizeof(struct ceph_msg_footer) :
1204
+
sizeof(struct ceph_msg_footer_old);
1205
+
}
1206
+
1200
1207
static void prepare_message_data(struct ceph_msg *msg, u32 data_len)
1201
1208
{
1202
1209
BUG_ON(!msg);
···
2342
2335
ceph_pr_addr(&con->peer_addr.in_addr),
2343
2336
seq, con->in_seq + 1);
2344
2337
con->in_base_pos = -front_len - middle_len - data_len -
2345
-
sizeof(m->footer);
2338
+
sizeof_footer(con);
2346
2339
con->in_tag = CEPH_MSGR_TAG_READY;
2347
-
return 0;
2340
+
return 1;
2348
2341
} else if ((s64)seq - (s64)con->in_seq > 1) {
2349
2342
pr_err("read_partial_message bad seq %lld expected %lld\n",
2350
2343
seq, con->in_seq + 1);
···
2367
2360
/* skip this message */
2368
2361
dout("alloc_msg said skip message\n");
2369
2362
con->in_base_pos = -front_len - middle_len - data_len -
2370
-
sizeof(m->footer);
2363
+
sizeof_footer(con);
2371
2364
con->in_tag = CEPH_MSGR_TAG_READY;
2372
2365
con->in_seq++;
2373
-
return 0;
2366
+
return 1;
2374
2367
}
2375
2368
2376
2369
BUG_ON(!con->in_msg);
+2
-2
net/ceph/osd_client.c
+2
-2
net/ceph/osd_client.c
···
2853
2853
mutex_lock(&osdc->request_mutex);
2854
2854
req = __lookup_request(osdc, tid);
2855
2855
if (!req) {
2856
-
pr_warn("%s osd%d tid %llu unknown, skipping\n",
2857
-
__func__, osd->o_osd, tid);
2856
+
dout("%s osd%d tid %llu unknown, skipping\n", __func__,
2857
+
osd->o_osd, tid);
2858
2858
m = NULL;
2859
2859
*skip = 1;
2860
2860
goto out;