git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
nbd.h
diff --git
a/include/linux/nbd.h
b/include/linux/nbd.h
index
a6ce409
..
e712e7d
100644
(file)
--- a/
include/linux/nbd.h
+++ b/
include/linux/nbd.h
@@
-77,11
+77,11
@@
struct nbd_device {
* server. All data are in network byte order.
*/
struct nbd_request {
* server. All data are in network byte order.
*/
struct nbd_request {
-
u
32 magic;
-
u32 type;
/* == READ || == WRITE */
+
__be
32 magic;
+
__be32 type;
/* == READ || == WRITE */
char handle[8];
char handle[8];
-
u
64 from;
-
u
32 len;
+
__be
64 from;
+
__be
32 len;
}
#ifdef __GNUC__
__attribute__ ((packed))
}
#ifdef __GNUC__
__attribute__ ((packed))
@@
-93,8
+93,8
@@
struct nbd_request {
* it has completed an I/O request (or an error occurs).
*/
struct nbd_reply {
* it has completed an I/O request (or an error occurs).
*/
struct nbd_reply {
-
u
32 magic;
-
u32 error;
/* 0 = ok, else error */
+
__be
32 magic;
+
__be32 error;
/* 0 = ok, else error */
char handle[8]; /* handle you got from request */
};
#endif
char handle[8]; /* handle you got from request */
};
#endif