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/net.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/net.h')
| -rw-r--r-- | kernel/net.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/net.h b/kernel/net.h index cdd7996..8fad623 100644 --- a/kernel/net.h +++ b/kernel/net.h @@ -2,7 +2,7 @@ #define LINUX_DNBD_NET_H 1 #include <linux/spinlock.h> -#include <asm/semaphore.h> +#include <linux/semaphore.h> #include <linux/list.h> #include <linux/param.h> #include <linux/jiffies.h> @@ -20,7 +20,7 @@ /* beta is 99% (990/1000) */ #define SRTT_BETA 990 -#define SRTT_BETA_BASE 1000 +#define SRTT_BETA_BASE 1000 #define SRTT_SHIFT 10 /* normalize weights to 255 as there is no float arithmetic in kernel */ @@ -29,7 +29,7 @@ #define dnbd_rx_update(servers, id) \ if ((id > 0) && (id <= SERVERS_MAX)) servers.serverlist[id-1].last_rx = jiffies; - + #define dnbd_tx_update(servers, id) \ if ((id > 0) && (id <= SERVERS_MAX)) servers.serverlist[id-1].last_tx = jiffies; @@ -59,7 +59,7 @@ struct dnbd_servers { }; typedef struct dnbd_servers dnbd_servers_t; - + /* functions */ int dnbd_set_serverid(dnbd_servers_t * servers, int id); int dnbd_next_server(dnbd_servers_t * servers); @@ -69,5 +69,5 @@ int dnbd_servers_init(dnbd_servers_t *servers); void dnbd_servers_weight(dnbd_servers_t * servers); int dnbd_show_servers(dnbd_servers_t * servers, void *buf, int size); void dnbd_clean_servers(dnbd_servers_t * servers); - + #endif |