From 9f55644462ae062125314358afc3adf28e07ee27 Mon Sep 17 00:00:00 2001 From: walter Date: Tue, 25 Sep 2007 15:18:46 +0000 Subject: [PATCH] convert uint64_t to __u64 --- lnet/include/libcfs/darwin/darwin-prim.h | 4 ++-- lnet/include/libcfs/darwin/darwin-sync.h | 2 +- lnet/include/libcfs/darwin/darwin-types.h | 4 ++-- lnet/include/libcfs/winnt/winnt-types.h | 2 +- lnet/klnds/mxlnd/mxlnd.h | 4 ++-- lnet/klnds/mxlnd/mxlnd_cb.c | 6 +++--- lnet/klnds/qswlnd/qswlnd.h | 2 +- lnet/klnds/qswlnd/qswlnd_cb.c | 4 ++-- lnet/klnds/viblnd/viblnd.c | 2 +- lnet/libcfs/darwin/darwin-sync.c | 8 ++++---- snmp/lustre-snmp-util.c | 4 ++-- snmp/lustre-snmp-util.h | 2 +- snmp/lustre-snmp.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lnet/include/libcfs/darwin/darwin-prim.h b/lnet/include/libcfs/darwin/darwin-prim.h index 00fbeed..0c201c2 100644 --- a/lnet/include/libcfs/darwin/darwin-prim.h +++ b/lnet/include/libcfs/darwin/darwin-prim.h @@ -213,7 +213,7 @@ cfs_duration_t cfs_waitq_timedwait(struct cfs_waitlink *link, * Thread schedule APIs. */ #define MAX_SCHEDULE_TIMEOUT ((long)(~0UL>>12)) -extern void thread_set_timer_deadline(uint64_t deadline); +extern void thread_set_timer_deadline(__u64 deadline); extern void thread_cancel_timer(void); static inline int cfs_schedule_timeout(int state, int64_t timeout) @@ -226,7 +226,7 @@ static inline int cfs_schedule_timeout(int state, int64_t timeout) result = assert_wait((event_t)current_uthread(), state); #endif if (timeout > 0) { - uint64_t expire; + __u64 expire; nanoseconds_to_absolutetime(timeout, &expire); clock_absolutetime_interval_to_deadline(expire, &expire); thread_set_timer_deadline(expire); diff --git a/lnet/include/libcfs/darwin/darwin-sync.h b/lnet/include/libcfs/darwin/darwin-sync.h index 5a3fabd..7817b38 100644 --- a/lnet/include/libcfs/darwin/darwin-sync.h +++ b/lnet/include/libcfs/darwin/darwin-sync.h @@ -282,7 +282,7 @@ void ksleep_add(struct ksleep_chan *chan, struct ksleep_link *link); void ksleep_del(struct ksleep_chan *chan, struct ksleep_link *link); void ksleep_wait(struct ksleep_chan *chan, int state); -int64_t ksleep_timedwait(struct ksleep_chan *chan, int state, uint64_t timeout); +int64_t ksleep_timedwait(struct ksleep_chan *chan, int state, __u64 timeout); void ksleep_wake(struct ksleep_chan *chan); void ksleep_wake_all(struct ksleep_chan *chan); diff --git a/lnet/include/libcfs/darwin/darwin-types.h b/lnet/include/libcfs/darwin/darwin-types.h index 0fd2966..805c3c8 100644 --- a/lnet/include/libcfs/darwin/darwin-types.h +++ b/lnet/include/libcfs/darwin/darwin-types.h @@ -69,8 +69,8 @@ typedef struct { volatile uint32_t counter; } atomic_t; #define atomic_inc(a) OSIncrementAtomic((SInt32 *)&((a)->counter)) #define atomic_dec(a) OSDecrementAtomic((SInt32 *)&((a)->counter)) #else /* !__DARWIN8__ */ -#define atomic_add(v, a) hw_atomic_add((uint32_t *)&((a)->counter), v) -#define atomic_sub(v, a) hw_atomic_sub((uint32_t *)&((a)->counter), v) +#define atomic_add(v, a) hw_atomic_add((__u32 *)&((a)->counter), v) +#define atomic_sub(v, a) hw_atomic_sub((__u32 *)&((a)->counter), v) #define atomic_inc(a) atomic_add(1, a) #define atomic_dec(a) atomic_sub(1, a) #endif /* !__DARWIN8__ */ diff --git a/lnet/include/libcfs/winnt/winnt-types.h b/lnet/include/libcfs/winnt/winnt-types.h index 6478730..b50b6bb 100644 --- a/lnet/include/libcfs/winnt/winnt-types.h +++ b/lnet/include/libcfs/winnt/winnt-types.h @@ -644,4 +644,4 @@ typedef __u32 cfs_kernel_cap_t; #define sigmask(sig) ((__u32)1 << ((sig) - 1)) -#endif // LIBCFS_SIGNAL_H \ No newline at end of file +#endif // LIBCFS_SIGNAL_H diff --git a/lnet/klnds/mxlnd/mxlnd.h b/lnet/klnds/mxlnd/mxlnd.h index ca03e84..0ffa5f8 100644 --- a/lnet/klnds/mxlnd/mxlnd.h +++ b/lnet/klnds/mxlnd/mxlnd.h @@ -371,9 +371,9 @@ extern lnet_nid_t mxlnd_nic_id2nid(lnet_ni_t *ni, u64 nic_id); extern u64 mxlnd_nid2nic_id(lnet_nid_t nid); /* in mxlnd_cb.c */ -void mxlnd_eager_recv(void *context, uint64_t match_value, uint32_t length); +void mxlnd_eager_recv(void *context, __u64 match_value, __u32 length); extern mx_unexp_handler_action_t mxlnd_unexpected_recv(void *context, - mx_endpoint_addr_t source, uint64_t match_value, uint32_t length, + mx_endpoint_addr_t source, __u64 match_value, __u64 length, void *data_if_available); extern void mxlnd_peer_free(struct kmx_peer *peer); extern void mxlnd_conn_free(struct kmx_conn *conn); diff --git a/lnet/klnds/mxlnd/mxlnd_cb.c b/lnet/klnds/mxlnd/mxlnd_cb.c index 31e0a48..ee38da7 100644 --- a/lnet/klnds/mxlnd/mxlnd_cb.c +++ b/lnet/klnds/mxlnd/mxlnd_cb.c @@ -970,7 +970,7 @@ mxlnd_recv_msg(lnet_msg_t *lntmsg, struct kmx_ctx *rx, u8 msg_type, u64 cookie, { int ret = 0; mx_return_t mxret = MX_SUCCESS; - uint64_t mask = 0xF00FFFFFFFFFFFFFLL; + __u64 mask = 0xF00FFFFFFFFFFFFFLL; rx->mxc_msg_type = msg_type; rx->mxc_lntmsg[0] = lntmsg; /* may be NULL if EAGER */ @@ -1018,7 +1018,7 @@ mxlnd_recv_msg(lnet_msg_t *lntmsg, struct kmx_ctx *rx, u8 msg_type, u64 cookie, */ mx_unexp_handler_action_t mxlnd_unexpected_recv(void *context, mx_endpoint_addr_t source, - uint64_t match_value, uint32_t length, void *data_if_available) + __u64 match_value, __u32 length, void *data_if_available) { int ret = 0; struct kmx_ctx *rx = NULL; @@ -1718,7 +1718,7 @@ mxlnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) struct kmx_ctx *rx_data = NULL; struct kmx_conn *conn = NULL; int nob = 0; - uint32_t length = 0; + __u32 length = 0; struct kmx_peer *peer = NULL; CDEBUG(D_NET, "sending %d bytes in %d frags to %s\n", diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h index 452959f..ba08e16 100644 --- a/lnet/klnds/qswlnd/qswlnd.h +++ b/lnet/klnds/qswlnd/qswlnd.h @@ -198,7 +198,7 @@ typedef struct kqswnal_tx struct kqswnal_tx *ktx_alloclist; /* stack in kqn_txds */ unsigned int ktx_state:7; /* What I'm doing */ unsigned int ktx_firsttmpfrag:1; /* ktx_frags[0] is in my ebuffer ? 0 : 1 */ - uint32_t ktx_basepage; /* page offset in reserved elan tx vaddrs for mapping pages */ + __u32 ktx_basepage; /* page offset in reserved elan tx vaddrs for mapping pages */ int ktx_npages; /* pages reserved for mapping messages */ int ktx_nmappedpages; /* # pages mapped for current message */ int ktx_port; /* destination ep port */ diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c index 86a1f8f..eaa890e 100644 --- a/lnet/klnds/qswlnd/qswlnd_cb.c +++ b/lnet/klnds/qswlnd/qswlnd_cb.c @@ -63,7 +63,7 @@ kqswnal_map_tx_kiov (kqswnal_tx_t *ktx, int offset, int nob, int nfrags = ktx->ktx_nfrag; int nmapped = ktx->ktx_nmappedpages; int maxmapped = ktx->ktx_npages; - uint32_t basepage = ktx->ktx_basepage + nmapped; + __u32 basepage = ktx->ktx_basepage + nmapped; char *ptr; EP_RAILMASK railmask; @@ -218,7 +218,7 @@ kqswnal_map_tx_iov (kqswnal_tx_t *ktx, int offset, int nob, int nfrags = ktx->ktx_nfrag; int nmapped = ktx->ktx_nmappedpages; int maxmapped = ktx->ktx_npages; - uint32_t basepage = ktx->ktx_basepage + nmapped; + __u32 basepage = ktx->ktx_basepage + nmapped; EP_RAILMASK railmask; int rail; diff --git a/lnet/klnds/viblnd/viblnd.c b/lnet/klnds/viblnd/viblnd.c index 09d407a..b094bff 100644 --- a/lnet/klnds/viblnd/viblnd.c +++ b/lnet/klnds/viblnd/viblnd.c @@ -1928,7 +1928,7 @@ kibnal_startup (lnet_ni_t *ni) /*****************************************************/ { - uint32_t nentries; + __u32 nentries; vvrc = vv_cq_create(kibnal_data.kib_hca, IBNAL_CQ_ENTRIES(), kibnal_cq_callback, diff --git a/lnet/libcfs/darwin/darwin-sync.c b/lnet/libcfs/darwin/darwin-sync.c index dc2af0f..8b752e3 100644 --- a/lnet/libcfs/darwin/darwin-sync.c +++ b/lnet/libcfs/darwin/darwin-sync.c @@ -773,7 +773,7 @@ void ksleep_wait(struct ksleep_chan *chan, cfs_task_state_t state) */ int64_t ksleep_timedwait(struct ksleep_chan *chan, cfs_task_state_t state, - uint64_t timeout) + __u64 timeout) { event_t event; @@ -787,7 +787,7 @@ int64_t ksleep_timedwait(struct ksleep_chan *chan, kspin_lock(&chan->guard); if (!has_hits(chan, event)) { int result; - uint64_t expire; + __u64 expire; result = assert_wait(event, state); if (timeout > 0) { /* @@ -807,7 +807,7 @@ int64_t ksleep_timedwait(struct ksleep_chan *chan, if (result == THREAD_TIMED_OUT) timeout = 0; else { - uint64_t now; + __u64 now; clock_get_uptime(&now); if (expire > now) absolutetime_to_nanoseconds(expire - now, &timeout); @@ -928,7 +928,7 @@ static void ktimer_actor(void *arg0, void *arg1) } extern boolean_t thread_call_func_cancel(thread_call_func_t, thread_call_param_t, boolean_t); -extern void thread_call_func_delayed(thread_call_func_t, thread_call_param_t, uint64_t); +extern void thread_call_func_delayed(thread_call_func_t, thread_call_param_t, __u64); static void ktimer_disarm_locked(struct ktimer *t) { diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c index 8048f2d..1e52a22 100644 --- a/snmp/lustre-snmp-util.c +++ b/snmp/lustre-snmp-util.c @@ -59,7 +59,7 @@ * *********************************************************************/ -char *get_file_list(const char *dirname, int file_type, uint32_t *count) +char *get_file_list(const char *dirname, int file_type, __u32 *count) { DIR *pdir = NULL; @@ -570,7 +570,7 @@ var_genericTable(struct variable *vp, struct oid_table *ptable) { char *dir_list; - uint32_t num; + __u32 num; int deviceindex; unsigned char *ret_val = NULL; int i=0; diff --git a/snmp/lustre-snmp-util.h b/snmp/lustre-snmp-util.h index 087e8cc..56770a2 100644 --- a/snmp/lustre-snmp-util.h +++ b/snmp/lustre-snmp-util.h @@ -154,7 +154,7 @@ typedef enum { } lustre_sysstatus; /* File operation related functions */ -char *get_file_list(const char *dirname, int file_type, uint32_t *count); +char *get_file_list(const char *dirname, int file_type, __u32 *count); extern int is_directory(const char *filename); extern int read_string(const char *filepath, char *lustre_var,size_t var_size); int read_counter64(const char *file_path, counter64 *c64,int factor); diff --git a/snmp/lustre-snmp.c b/snmp/lustre-snmp.c index 0de2c4d..b80e2ac 100644 --- a/snmp/lustre-snmp.c +++ b/snmp/lustre-snmp.c @@ -204,7 +204,7 @@ var_clusterFileSystems(struct variable *vp, static u_long ulong_ret; static unsigned char string[SPRINT_MAX_LEN]; char file_path[MAX_PATH_SIZE]; - uint32_t num; + __u32 num; char *dir_list; if (header_generic(vp,name,length,exact,var_len,write_method) -- 1.8.3.1