diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-26 09:35:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-26 09:35:03 -0800 |
| commit | 29a9faa641857425af76e44f2fab22db53032401 (patch) | |
| tree | 8bff7e5cba24ccf5d190e5bbe0a8ec65e56ba462 /net/ceph/osd_client.c | |
| parent | c213341e4962c798274e024e89dd4b14d4826872 (diff) | |
| parent | cd8140c673d9ba9be3591220e1b2226d9e1e40d3 (diff) | |
| download | op-kernel-dev-29a9faa641857425af76e44f2fab22db53032401.zip op-kernel-dev-29a9faa641857425af76e44f2fab22db53032401.tar.gz | |
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
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 3534e12..5bc0537 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2853,8 +2853,8 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, mutex_lock(&osdc->request_mutex); req = __lookup_request(osdc, tid); if (!req) { - pr_warn("%s osd%d tid %llu unknown, skipping\n", - __func__, osd->o_osd, tid); + dout("%s osd%d tid %llu unknown, skipping\n", __func__, + osd->o_osd, tid); m = NULL; *skip = 1; goto out; |
