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 e712e7d..f95d51f 100644 (file)
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -38,7 +38,6 @@ enum {
 #ifdef __KERNEL__
 
 #include <linux/wait.h>
-#include <linux/mutex.h>
 
 /* values for flags field */
 #define NBD_READ_ONLY 0x0001
@@ -58,7 +57,7 @@ struct nbd_device {
        struct request *active_req;
        wait_queue_head_t active_wq;
 
-       struct mutex tx_lock;
+       struct semaphore tx_lock;
        struct gendisk *disk;
        int blksize;
        u64 bytesize;
@@ -77,11 +76,11 @@ struct nbd_device {
  * server. All data are in network byte order.
  */
 struct nbd_request {
-       __be32 magic;
-       __be32 type;    /* == READ || == WRITE  */
+       u32 magic;
+       u32 type;       /* == READ || == WRITE  */
        char handle[8];
-       __be64 from;
-       __be32 len;
+       u64 from;
+       u32 len;
 }
 #ifdef __GNUC__
        __attribute__ ((packed))
@@ -93,8 +92,8 @@ struct nbd_request {
  * it has completed an I/O request (or an error occurs).
  */
 struct nbd_reply {
-       __be32 magic;
-       __be32 error;           /* 0 = ok, else error   */
+       u32 magic;
+       u32 error;              /* 0 = ok, else error   */
        char handle[8];         /* handle you got from request  */
 };
 #endif