Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13e71d69 authored by Markus Pargmann's avatar Markus Pargmann Committed by Jens Axboe
Browse files

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: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4e5b44ca

drivers/block/nbd.c

+22 −0
Original line number Diff line number Diff line
@@ -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

include/linux/nbd.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * 1999 Copyright (C) Pavel Machek, pavel@ucw.cz. This code is GPL.

 * 1999/11/04 Copyright (C) 1999 VMware, Inc. (Regis "HPReg" Duchesne)

 *            Made nbd_end_request() use the io_request_lock

 * 2001 Copyright (C) Steven Whitehouse

 *            New nbd_end_request() for compatibility with new linux block

 *            layer code.

 * 2003/06/24 Louis D. Langholtz <ldl@aros.net>

 *            Removed unneeded blksize_bits field from nbd_device struct.

 *            Cleanup PARANOIA usage & code.

 * 2004/02/19 Paul Clements

 *            Removed PARANOIA, plus various cleanup and comments

 */

#ifndef LINUX_NBD_H

#define LINUX_NBD_H





#include <linux/wait.h>

#include <linux/mutex.h>

#include <uapi/linux/nbd.h>



struct request;



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 */

};



#endif