git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2046 29311d96-e01e-0410-9327-a35deaa...

diff --git a/trunk/ceph/kernel/messenger.h b/trunk/ceph/kernel/messenger.h
index 7e412a9b5cc7d62bc908f518ce2f69f8d9a57a76..2fd4d2553b7b3363a93955dfe4333d282db97360 100644 (file)
--- a/trunk/ceph/kernel/messenger.h
+++ b/trunk/ceph/kernel/messenger.h
@@ -10,6 +10,8 @@
 
 struct ceph_message;
 
+struct ceph_poll_task *start_poll(void);
+
 typedef void (*ceph_messenger_dispatch_t) (void *p, struct ceph_message *m);
 
 /* list of pollable files */
@@ -24,6 +26,7 @@ struct ceph_poll_task {
         struct task_struct *poll_task;
        struct ceph_pollable *pfiles;
         int nfds;
+       u64 timeout;
 };
 
 struct ceph_messenger {
@@ -91,6 +94,7 @@ struct ceph_connection {
        struct work_struct rwork;               /* received work */
        struct work_struct swork;               /* send work */
        int retries;
+       int error;                              /* error on connection */
 };
 
 /*