diff options
author | Sebastian Schmelzer | 2009-01-26 17:46:19 +0100 |
---|---|---|
committer | Sebastian Schmelzer | 2009-01-26 17:46:19 +0100 |
commit | 626522ddfe2c3ff00c0f464c7619ef8cee7ccfe0 (patch) | |
tree | efefe5f63aa21337003cc3673a2fa8f022a4d750 /kernel/dnbd.h | |
parent | * added dnbd-client to svn:ignore (diff) | |
download | dnbd-626522ddfe2c3ff00c0f464c7619ef8cee7ccfe0.tar.gz dnbd-626522ddfe2c3ff00c0f464c7619ef8cee7ccfe0.tar.xz dnbd-626522ddfe2c3ff00c0f464c7619ef8cee7ccfe0.zip |
* 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
Diffstat (limited to 'kernel/dnbd.h')
-rw-r--r-- | kernel/dnbd.h | 10 |
1 files changed, 5 insertions, 5 deletions
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 <linux/completion.h> #include <linux/in.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> #include <linux/blkdev.h> #include <linux/rbtree.h> #include <linux/jiffies.h> @@ -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 */ |