From 626522ddfe2c3ff00c0f464c7619ef8cee7ccfe0 Mon Sep 17 00:00:00 2001 From: Sebastian Schmelzer Date: Mon, 26 Jan 2009 16:46:19 +0000 Subject: * switched from asm/semaphore.h includes to linux/semaphore.h * fixed request_queue type * changed/removed end_that_request_* calls due to blockdev api changes TESTING REQUIRED ... git-svn-id: http://svn.openslx.org/svn/openslx/contrib/dnbd/trunk@2526 95ad53e4-c205-0410-b2fa-d234c58c8868 --- kernel/dnbd.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kernel/dnbd.h') diff --git a/kernel/dnbd.h b/kernel/dnbd.h index 8d232b0..a744038 100644 --- a/kernel/dnbd.h +++ b/kernel/dnbd.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include @@ -30,16 +30,16 @@ struct dnbd_device { int state; struct socket *sock; /* network socket */ struct sockaddr_in mcast; - struct file *file; + struct file *file; spinlock_t thread_lock; /* locks */ spinlock_t queue_lock; - spinlock_t timer_lock; + spinlock_t timer_lock; struct semaphore semalock; struct gendisk *disk; /* general disk interface */ int blksize; u64 bytesize; atomic_t refcnt; /* reference counter for module */ - dnbd_thread_t rx_thread; + dnbd_thread_t rx_thread; dnbd_thread_t tx_thread; dnbd_thread_t ss_thread; atomic_t num_io_threads; @@ -52,6 +52,6 @@ struct dnbd_device { }; typedef struct dnbd_device dnbd_device_t; - + #endif /* LINUX_DNBD_H */ -- cgit v1.2.3-55-g7522