Skip to content

Commit

Permalink
nbd: Remove kernel internal header
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Markus Pargmann authored and Jens Axboe committed Apr 2, 2015
1 parent 4e5b44c commit 13e71d6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 46 deletions.
22 changes: 22 additions & 0 deletions drivers/block/nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 0 additions & 46 deletions include/linux/nbd.h

This file was deleted.

0 comments on commit 13e71d6

Please sign in to comment.