linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / nbd.h

diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 090e210..f95d51f 100644 (file)
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -37,18 +37,26 @@ enum {
 /* userspace doesn't need the nbd_device structure */
 #ifdef __KERNEL__
 
+#include <linux/wait.h>
+
 /* values for flags field */
 #define NBD_READ_ONLY 0x0001
 #define NBD_WRITE_NOCHK 0x0002
 
+struct request;
+
 struct nbd_device {
        int flags;
        int harderror;          /* Code of hard error                   */
        struct socket * sock;
        struct file * file;     /* If == NULL, device is not ready, yet */
        int magic;
+
        spinlock_t queue_lock;
        struct list_head queue_head;/* Requests are added here...       */
+       struct request *active_req;
+       wait_queue_head_t active_wq;
+
        struct semaphore tx_lock;
        struct gendisk *disk;
        int blksize;