Whamcloud - gitweb
* Fix interrupt-pending-when-timeout-occurs handling in l_wait_event.
[fs/lustre-release.git] / lustre / include / linux / lustre_lib.h
index 3bb73a0..c1db457 100644 (file)
 #else
 # include <asm/semaphore.h>
 #endif
-
 #include <linux/portals_lib.h>
 #include <linux/lustre_idl.h>
 
 #ifdef __KERNEL__
 /* l_net.c */
 struct ptlrpc_request;
+struct obd_device;
 int target_handle_connect(struct ptlrpc_request *req);
 int target_handle_disconnect(struct ptlrpc_request *req);
+int client_obd_connect(struct lustre_handle *conn, struct obd_device *obd,
+                       char *cluuid);
+int client_obd_disconnect(struct lustre_handle *conn);
+int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf);
+int client_obd_cleanup(struct obd_device * obddev);
+struct client_obd *client_conn2cli(struct lustre_handle *conn); 
 
 /* l_lock.c */
 struct lustre_lock { 
@@ -54,6 +60,17 @@ void l_unlock(struct lustre_lock *);
 
 
 /* page.c */
+#define CB_PHASE_START   12
+#define CB_PHASE_FINISH  13
+struct io_cb_data {
+        wait_queue_head_t waitq;
+        atomic_t refcount;
+        int complete;
+        int err;
+        struct ptlrpc_bulk_desc *desc;
+};
+int ll_sync_io_cb(struct io_cb_data *data, int err, int phase);
+struct  io_cb_data *ll_init_cb(void);
 inline void lustre_put_page(struct page *page);
 struct page *lustre_get_page_read(struct inode *dir, unsigned long index);
 struct page *lustre_get_page_write(struct inode *dir, unsigned long index);
@@ -285,6 +302,8 @@ static inline int obd_ioctl_pack(struct obd_ioctl_data *data, char **pbuf,
 
 #else
 
+#include <linux/obd_support.h>
+
 /* buffer MUST be at least the size of obd_ioctl_hdr */
 static inline int obd_ioctl_getdata(char **buf, int *len, void *arg)
 {
@@ -389,77 +408,107 @@ static inline int obd_ioctl_getdata(char **buf, int *len, void *arg)
 
 #define OBD_IOC_DEC_FS_USE_COUNT       _IO  ('f', 133      )
 
+struct l_wait_info {
+        long   lwi_timeout;
+        int  (*lwi_on_timeout)(void *);
+        long   lwi_signals;
+        int  (*lwi_on_signal)(void *); /* XXX return is ignored for now */
+        void  *lwi_cb_data;
+};
 
+#define LWI_TIMEOUT(time, cb, data)                                             \
+((struct l_wait_info) {                                                         \
+        lwi_timeout:    time,                                                   \
+        lwi_on_timeout: cb,                                                     \
+        lwi_cb_data:    data                                                    \
+})
 
+#define LWI_INTR(signals, cb, data)                                             \
+((struct l_wait_info) {                                                         \
+        lwi_signals:   signals,                                                 \
+        lwi_on_signal: cb,                                                      \
+        lwi_cb_data:   data                                                     \
+})
 
+#define LWI_TIMEOUT_INTR(time, time_cb, signals, sig_cb, data)                  \
+((struct l_wait_info) {                                                         \
+        lwi_timeout:    time,                                                   \
+        lwi_on_timeout: time_cb,                                                \
+        lwi_signals:    signals,                                                \
+        lwi_on_signal:  sig_cb,                                                 \
+        lwi_cb_data:    data                                                    \
+})
 
 /* XXX this should be one mask-check */
-#define l_killable_pending(task)                                               \
-(sigismember(&(task->pending.signal), SIGKILL) ||                              \
- sigismember(&(task->pending.signal), SIGINT) ||                               \
+#define l_killable_pending(task)                                                \
+(sigismember(&(task->pending.signal), SIGKILL) ||                               \
+ sigismember(&(task->pending.signal), SIGINT) ||                                \
  sigismember(&(task->pending.signal), SIGTERM))
 
-/*
- * Like wait_event_interruptible, but we're only interruptible by KILL, INT, or
- * TERM.
- *
- * XXXshaver These are going away soon, I hope.
- */
-#define __l_wait_event_killable(wq, condition, ret)                          \
-do {                                                                         \
-        wait_queue_t __wait;                                                 \
-        init_waitqueue_entry(&__wait, current);                              \
-                                                                             \
-        add_wait_queue(&wq, &__wait);                                        \
-        for (;;) {                                                           \
-                set_current_state(TASK_INTERRUPTIBLE);                       \
-                if (condition)                                               \
-                        break;                                               \
-                if (!signal_pending(current) ||                              \
-                    !l_killable_pending(current)) {                          \
-                        schedule();                                          \
-                        continue;                                            \
-                }                                                            \
-                ret = -ERESTARTSYS;                                          \
-                break;                                                       \
-        }                                                                    \
-        current->state = TASK_RUNNING;                                       \
-        remove_wait_queue(&wq, &__wait);                                     \
-} while(0)
-
-#define l_wait_event_killable(wq, condition)                            \
-({                                                                      \
-        int __ret = 0;                                                  \
-        if (!(condition))                                               \
-                __l_wait_event_killable(wq, condition, __ret);          \
-        __ret;                                                          \
-})
-
-#define __l_wait_event_timeout(wq, condition, timeout, ret)                   \
-do {                                                                          \
-        wait_queue_t __wait;                                                  \
-        init_waitqueue_entry(&__wait, current);                               \
-                                                                              \
-        add_wait_queue(&wq, &__wait);                                         \
-        for (;;) {                                                            \
-                set_current_state(TASK_INTERRUPTIBLE);                        \
-                if (condition)                                                \
-                        break;                                                \
-                if (timeout)                                                  \
-                        schedule_timeout(timeout);                            \
-                else                                                          \
-                        schedule();                                           \
-        }                                                                     \
-        current->state = TASK_RUNNING;                                        \
-        remove_wait_queue(&wq, &__wait);                                      \
+#define __l_wait_event(wq, condition, info, ret)                                \
+do {                                                                            \
+        wait_queue_t __wait;                                                    \
+        long __state;                                                           \
+        init_waitqueue_entry(&__wait, current);                                 \
+                                                                                \
+        add_wait_queue(&wq, &__wait);                                           \
+        __state = TASK_UNINTERRUPTIBLE;                                         \
+        for (;;) {                                                              \
+            set_current_state(__state);                                         \
+            if (condition)                                                      \
+                    break;                                                      \
+            /* We only become INTERRUPTIBLE if a timeout has fired, and         \
+             * the caller has given us some signals to care about.              \
+             *                                                                  \
+             * XXXshaver we should check against info->wli_signals here,        \
+             * XXXshaver instead of just using l_killable_pending, perhaps.     \
+             */                                                                 \
+            if (__state == TASK_INTERRUPTIBLE &&                                \
+                l_killable_pending(current)) {                                  \
+                    CERROR("lwe: interrupt for %d\n", current->pid);            \
+                    if (info->lwi_on_signal)                                    \
+                            info->lwi_on_signal(info->lwi_cb_data);             \
+                    ret = -EINTR;                                               \
+                    break;                                                      \
+            }                                                                   \
+            if (info->lwi_timeout) {                                            \
+                if (schedule_timeout(info->lwi_timeout) == 0) {                 \
+                    CERROR("lwe: timeout for %d\n", current->pid);              \
+                    if (!info->lwi_on_timeout ||                                \
+                        info->lwi_on_timeout(info->lwi_cb_data)) {              \
+                        ret = -ETIMEDOUT;                                       \
+                        break;                                                  \
+                    }                                                           \
+                    /* We'll take signals only after a timeout. */              \
+                    if (info->lwi_signals) {                                    \
+                        __state = TASK_INTERRUPTIBLE;                           \
+                        /* Check for a pending interrupt. */                    \
+                        if (info->lwi_signals &&                                \
+                            l_killable_pending(current)) {                      \
+                             CERROR("lwe: pending interrupt for %d\n",          \
+                                    current->pid);                              \
+                             if (info->lwi_on_signal)                           \
+                                 info->lwi_on_signal(info->lwi_cb_data);        \
+                             ret = -EINTR;                                      \
+                             break;                                             \
+                        }                                                       \
+                    }                                                           \
+                }                                                               \
+            } else {                                                            \
+                schedule();                                                     \
+            }                                                                   \
+        }                                                                       \
+        current->state = TASK_RUNNING;                                          \
+        remove_wait_queue(&wq, &__wait);                                        \
 } while(0)
 
-#define l_wait_event_timeout(wq, condition, timeout)                          \
-({                                                                            \
-        int __ret = 0;                                                        \
-        if (!(condition))                                                     \
-                __l_wait_event_timeout(wq, condition, timeout, __ret);        \
-        __ret;                                                                \
+#define l_wait_event(wq, condition, info)                                       \
+({                                                                              \
+        int __ret = 0;                                                          \
+        struct l_wait_info *__info = (info);                                    \
+        if (!(condition))                                                       \
+                __l_wait_event(wq, condition, __info, __ret);                   \
+        __ret;                                                                  \
 })
 
 #endif /* _LUSTRE_LIB_H */