From dd5a4db6dc90f5dc72c2f4dc38e7880a28d58433 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 29 Dec 2003 05:53:57 -0800 Subject: [PATCH] [PATCH] fix userspace compiles with nbd.h From: Paul Clements A previous "cleanup" on the nbd.h header file broke userspace compiles. I've added an #ifdef __KERNEL__ so that userspace doesn't need to worry about the nbd_device structure, which is only used in-kernel. The patch allows me to compile my nbd tools with the 2.6 nbd.h. --- include/linux/nbd.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/nbd.h b/include/linux/nbd.h index 8a3311efe2847..dcb0228efcae7 100644 --- a/include/linux/nbd.h +++ b/include/linux/nbd.h @@ -35,6 +35,9 @@ enum { /* Define PARANOIA to include extra sanity checking code in here & driver */ #define PARANOIA +/* userspace doesn't need the nbd_device structure */ +#ifdef __KERNEL__ + struct nbd_device { int flags; int harderror; /* Code of hard error */ @@ -53,6 +56,8 @@ struct nbd_device { u64 bytesize; }; +#endif + /* This now IS in some kind of include file... */ /* These are send over network in request/reply magic field */ -- 2.53.0