X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Fnbd.h;h=0f3e69302540d71222d61fa22e2fbdbd2706aae9;hb=c4366889dda8110247be59ca41fddb82951a8c26;hp=1d7cdd20b5530677a8140feed5ac1483089108ca;hpb=cee4cca740d209bcb4b9857baa2253d5ba4e3fbe;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 1d7cdd20b55..0f3e6930254 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -15,6 +15,8 @@
 #ifndef LINUX_NBD_H
 #define LINUX_NBD_H
 
+#include <linux/types.h>
+
 #define NBD_SET_SOCK	_IO( 0xab, 0 )
 #define NBD_SET_BLKSIZE	_IO( 0xab, 1 )
 #define NBD_SET_SIZE	_IO( 0xab, 2 )
@@ -62,6 +64,7 @@ struct nbd_device {
 	struct gendisk *disk;
 	int blksize;
 	u64 bytesize;
+	pid_t pid; /* pid of nbd-client, if attached */
 };
 
 #endif
@@ -77,11 +80,11 @@ struct nbd_device {
  * server. All data are in network byte order.
  */
 struct nbd_request {
-	__u32 magic;
-	__u32 type;	/* == READ || == WRITE 	*/
+	__be32 magic;
+	__be32 type;	/* == READ || == WRITE 	*/
 	char handle[8];
-	__u64 from;
-	__u32 len;
+	__be64 from;
+	__be32 len;
 }
 #ifdef __GNUC__
 	__attribute__ ((packed))
@@ -93,8 +96,8 @@ struct nbd_request {
  * it has completed an I/O request (or an error occurs).
  */
 struct nbd_reply {
-	__u32 magic;
-	__u32 error;		/* 0 = ok, else error	*/
+	__be32 magic;
+	__be32 error;		/* 0 = ok, else error	*/
 	char handle[8];		/* handle you got from request	*/
 };
 #endif