diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2019-06-11 13:27:19 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-06-13 09:55:09 -0500 |
| commit | 86f8cdf3db8bc263ae08885e04ce96c089d1cac8 (patch) | |
| tree | 22c89ecde745cc0d8ef5122ca3ed92ae7b4ff5dd /block/trace-events | |
| parent | 0a93b359db270788b81c1dba6ce868877381fa94 (diff) | |
block/nbd: merge nbd-client.* to nbd.c
No reason for keeping driver handlers realization separate from driver
structure. We can get rid of extra header file.
While being here, fix comments style, restore forgotten comments for
NBD_FOREACH_REPLY_CHUNK and nbd_reply_chunk_iter_receive, remove extra
includes.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20190611102720.86114-3-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/trace-events')
| -rw-r--r-- | block/trace-events | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/trace-events b/block/trace-events index 01fa5eb081..f6e43ee023 100644 --- a/block/trace-events +++ b/block/trace-events @@ -160,7 +160,7 @@ nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pa # iscsi.c iscsi_xcopy(void *src_lun, uint64_t src_off, void *dst_lun, uint64_t dst_off, uint64_t bytes, int ret) "src_lun %p offset %"PRIu64" dst_lun %p offset %"PRIu64" bytes %"PRIu64" ret %d" -# nbd-client.c +# nbd.c nbd_parse_blockstatus_compliance(const char *err) "ignoring extra data from non-compliant server: %s" nbd_structured_read_compliance(const char *type) "server sent non-compliant unaligned read %s chunk" nbd_read_reply_entry_fail(int ret, const char *err) "ret = %d, err: %s" |