diff options
| author | David Howells <dhowells@cambridge.redhat.com> | 2002-11-03 18:14:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-11-03 18:14:36 -0800 |
| commit | 02a4eb10c0be4062858ecf3482c15439bc855e0d (patch) | |
| tree | 68f3dc78602bd78942be9e50ebed629ee5341572 /include | |
| parent | b1b782f7b7fced03a6dc51d3e52595fcfc9ac106 (diff) | |
[PATCH] AFS compile breakage
Fix:
- Makefile using obj-m directly, rather than subsituting the "m"
- compiler breakage against older versions of gcc
- adds some lacking return statements that gcc didn't catch
- removes some 2.4 compatibility stuff
- RTT calculation
- puts the timeouts in terms of HZ rather than assuming HZ==100
Diffstat (limited to 'include')
| -rw-r--r-- | include/rxrpc/call.h | 4 | ||||
| -rw-r--r-- | include/rxrpc/peer.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h index 0ae39ad9c612..5afe044b3f46 100644 --- a/include/rxrpc/call.h +++ b/include/rxrpc/call.h @@ -153,7 +153,7 @@ do { (CALL)->app_scr_alloc = (CALL)->app_scratch; } while(0) (CALL)->app_scr_alloc += (SIZE); \ if ((SIZE)>RXRPC_CALL_SCRATCH_SIZE || \ (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ - printk("rxrpc_call_alloc_scratch(%p,%u)\n",(CALL),(SIZE)); \ + printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),(size_t)(SIZE)); \ BUG(); \ } \ ptr; \ @@ -167,7 +167,7 @@ do { (CALL)->app_scr_alloc = (CALL)->app_scratch; } while(0) (CALL)->app_scr_alloc += size; \ if (size>RXRPC_CALL_SCRATCH_SIZE || \ (size_t)((CALL)->app_scr_alloc - (u8*)(CALL)) > RXRPC_CALL_SCRATCH_SIZE) { \ - printk("rxrpc_call_alloc_scratch(%p,%u)\n",(CALL),size); \ + printk("rxrpc_call_alloc_scratch(%p,%Zu)\n",(CALL),size); \ BUG(); \ } \ ptr; \ diff --git a/include/rxrpc/peer.h b/include/rxrpc/peer.h index 9f09bc95a40f..0ab2730541ed 100644 --- a/include/rxrpc/peer.h +++ b/include/rxrpc/peer.h @@ -57,8 +57,8 @@ struct rxrpc_peer /* calculated RTT cache */ #define RXRPC_RTT_CACHE_SIZE 32 suseconds_t rtt; /* current RTT estimate (in uS) */ - unsigned short rtt_point; /* next entry at which to insert */ - unsigned short rtt_usage; /* amount of cache actually used */ + unsigned rtt_point; /* next entry at which to insert */ + unsigned rtt_usage; /* amount of cache actually used */ suseconds_t rtt_cache[RXRPC_RTT_CACHE_SIZE]; /* calculated RTT cache */ }; |