diff options
author | Markus Pargmann <mpa@pengutronix.de> | 2015-04-02 10:11:35 +0200 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-04-02 12:39:18 -0600 |
commit | 13e71d69cc7444b7d840bab581dbe831e440fb62 (patch) | |
tree | 3fb5df01c11fcd7b560843e6ea9717f8ada4186e /drivers/block | |
parent | 4e5b44ca7b5c44872b6ec172331a5545116e2d46 (diff) | |
download | blackbird-op-linux-13e71d69cc7444b7d840bab581dbe831e440fb62.tar.gz blackbird-op-linux-13e71d69cc7444b7d840bab581dbe831e440fb62.zip |
nbd: Remove kernel internal header
The header is not included anywhere. Remove it and include the private
nbd_device struct in nbd.c.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nbd.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index a98c41f72c63..1aaabcc2af92 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -38,6 +38,28 @@ #include <linux/nbd.h> +struct nbd_device { + int flags; + int harderror; /* Code of hard error */ + struct socket * sock; /* If == NULL, device is not ready, yet */ + int magic; + + spinlock_t queue_lock; + struct list_head queue_head; /* Requests waiting result */ + struct request *active_req; + wait_queue_head_t active_wq; + struct list_head waiting_queue; /* Requests to be sent */ + wait_queue_head_t waiting_wq; + + struct mutex tx_lock; + struct gendisk *disk; + int blksize; + u64 bytesize; + pid_t pid; /* pid of nbd-client, if attached */ + int xmit_timeout; + int disconnect; /* a disconnect has been requested by user */ +}; + #define NBD_MAGIC 0x68797548 #ifdef NDEBUG |