From 23d688b339c756d85e33949a5defe29bae074a19 Mon Sep 17 00:00:00 2001 From: patiencew Date: Mon, 22 Oct 2007 23:55:14 +0000 Subject: [PATCH] git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1984 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/kernel/kmsg.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/trunk/ceph/kernel/kmsg.h b/trunk/ceph/kernel/kmsg.h index 2b6281ce6a483..ed0364f05ae01 100644 --- a/trunk/ceph/kernel/kmsg.h +++ b/trunk/ceph/kernel/kmsg.h @@ -5,28 +5,30 @@ #include #include #include -#include "ceph_kthread.h" +#include "accepter.h" +#include "bufferlist.h" /* dispatch function type */ typedef void (*ceph_kmsg_work_dispatch_t)(struct work_struct *); +extern struct workqueue_struct *wq; /* work queue (worker threads) */ + struct ceph_kmsgr { void *m_parent; struct radix_tree_root mpipes; /* other nodes talk to */ - struct ceph_client_info cthread; /* listener or select thread info */ - struct workqueue_struct *wq; /* work queue (worker threads) */ + struct ceph_accepter accepter; /* listener or select thread info */ struct work_struct *work; /* received work */ /* note: work->func = dispatch func */ }; struct ceph_message { + atomic_t nref; struct ceph_message_header *msghdr; /* header */ struct ceph_bufferlist payload; struct list_head m_list_head; - atomic_t nref; }; -struct ceph_kmsg_pipe { +struct ceph_connection { int p_sd; /* socket descriptor */ __u64 p_out_seq; /* last message sent */ __u64 p_in_seq; /* last message received */ -- 2.39.5