diff options
Diffstat (limited to 'include/linux/nbd.h')
-rw-r--r-- | include/linux/nbd.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/nbd.h b/include/linux/nbd.h index 986572081e19..155719dab813 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h | |||
@@ -56,9 +56,11 @@ struct nbd_device { | |||
56 | int magic; | 56 | int magic; |
57 | 57 | ||
58 | spinlock_t queue_lock; | 58 | spinlock_t queue_lock; |
59 | struct list_head queue_head;/* Requests are added here... */ | 59 | struct list_head queue_head; /* Requests waiting result */ |
60 | struct request *active_req; | 60 | struct request *active_req; |
61 | wait_queue_head_t active_wq; | 61 | wait_queue_head_t active_wq; |
62 | struct list_head waiting_queue; /* Requests to be sent */ | ||
63 | wait_queue_head_t waiting_wq; | ||
62 | 64 | ||
63 | struct mutex tx_lock; | 65 | struct mutex tx_lock; |
64 | struct gendisk *disk; | 66 | struct gendisk *disk; |
@@ -86,11 +88,7 @@ struct nbd_request { | |||
86 | char handle[8]; | 88 | char handle[8]; |
87 | __be64 from; | 89 | __be64 from; |
88 | __be32 len; | 90 | __be32 len; |
89 | } | 91 | } __attribute__ ((packed)); |
90 | #ifdef __GNUC__ | ||
91 | __attribute__ ((packed)) | ||
92 | #endif | ||
93 | ; | ||
94 | 92 | ||
95 | /* | 93 | /* |
96 | * This is the reply packet that nbd-server sends back to the client after | 94 | * This is the reply packet that nbd-server sends back to the client after |