[openib-general] [PATCH] Kill more t??? typedefs
Tom Duffy
tduffy at sun.com
Mon Aug 9 14:52:04 PDT 2004
This patch gets rid of all the t[U]INT* types in Roland's branch.
Signed-by: Tom Duffy <tduffy at sun.com> with permission from Sun legal.
Index: drivers/infiniband/ulp/dapl/khash.c
===================================================================
--- drivers/infiniband/ulp/dapl/khash.c (revision 615)
+++ drivers/infiniband/ulp/dapl/khash.c (working copy)
@@ -42,10 +42,10 @@
#define DAPL_CHECK_LT(value, bound, result) \
if ((bound) > (value)) return(result);
-static inline tUINT32 _DaplKeyHash(DAPL_HASH_TABLE table, char *key)
+static inline u32 _DaplKeyHash(DAPL_HASH_TABLE table, char *key)
{
- tUINT32 i;
- tUINT32 s = 0;
+ u32 i;
+ u32 s = 0;
for (i = 0; i < HASH_KEY_SIZE; i++)
s += key[i];
@@ -57,12 +57,12 @@
/* Static functions for simple hash table bucket managment */
/* ------------------------------------------------------------------------- */
static kmem_cache_t *_bucket_cache = NULL;
-static tINT32 _use_count = 0;
+static s32 _use_count = 0;
/* ========================================================================= */
/*.._DaplBucketCacheCreate -- create, if necessary, a bucket cache */
-static tINT32 _DaplBucketCacheCreate(void
- ) {
+static s32 _DaplBucketCacheCreate(void)
+{
if (NULL == _bucket_cache) {
DAPL_EXPECT((0 == _use_count));
@@ -83,8 +83,8 @@
/* ========================================================================= */
/*.._DaplBucketCacheDestroy -- destroy, if necessary, the bucket cache */
-static tINT32 _DaplBucketCacheDestroy(void
- ) {
+static s32 _DaplBucketCacheDestroy(void)
+{
DAPL_CHECK_NULL(_bucket_cache, -EINVAL);
DAPL_CHECK_LT(_use_count, 1, -EINVAL);
@@ -100,8 +100,8 @@
/* ========================================================================= */
/*.._DaplBucketCacheGet -- get the bucket cache */
-static kmem_cache_t *_DaplBucketCacheGet(void
- ) {
+static kmem_cache_t *_DaplBucketCacheGet(void)
+{
return _bucket_cache;
} /* _DaplBucketCacheGet */
@@ -111,9 +111,10 @@
/* ========================================================================= */
/*..DaplHashTableCreate -- create the simple hash table */
-DAPL_HASH_TABLE DaplHashTableCreate(tINT32 size) {
+DAPL_HASH_TABLE DaplHashTableCreate(s32 size)
+{
DAPL_HASH_TABLE table;
- tINT32 result;
+ s32 result;
/*
* round size down to a multiple of a bucket pointer.
*/
@@ -161,9 +162,10 @@
/* ========================================================================= */
/*..DaplHashTableDestroy -- destroy the simple hash table */
-tINT32 DaplHashTableDestroy(DAPL_HASH_TABLE table) {
+s32 DaplHashTableDestroy(DAPL_HASH_TABLE table)
+{
DAPL_HASH_BUCKET trav_bucket;
- tINT32 counter;
+ s32 counter;
DAPL_CHECK_NULL(table, -EINVAL);
/*
@@ -187,10 +189,10 @@
/* ========================================================================= */
/*..DaplHashTableInsert -- insert a value into the hash table */
-tINT32 DaplHashTableInsert
- (DAPL_HASH_TABLE table, char *key, unsigned long value) {
+s32 DaplHashTableInsert(DAPL_HASH_TABLE table, char *key, unsigned long value)
+{
DAPL_HASH_BUCKET bucket;
- tUINT32 offset;
+ u32 offset;
DAPL_CHECK_NULL(_DaplBucketCacheGet(), -EINVAL);
DAPL_CHECK_NULL(table, -EINVAL);
@@ -234,10 +236,10 @@
/* ========================================================================= */
/*..DaplHashTableLookup -- lookup a value using it's key in the table */
-tINT32 DaplHashTableLookup
- (DAPL_HASH_TABLE table, char *key, unsigned long *value) {
+s32 DaplHashTableLookup(DAPL_HASH_TABLE table, char *key, unsigned long *value)
+{
DAPL_HASH_BUCKET bucket;
- tUINT32 offset;
+ u32 offset;
DAPL_CHECK_NULL(table, -EINVAL);
/*
@@ -263,10 +265,10 @@
/* ========================================================================= */
/*..DaplHashTableRemove -- remove a src indexed entry from the table */
-tINT32 DaplHashTableRemove
- (DAPL_HASH_TABLE table, char *key, unsigned long *value) {
+s32 DaplHashTableRemove(DAPL_HASH_TABLE table, char *key, unsigned long *value)
+{
DAPL_HASH_BUCKET bucket;
- tUINT32 offset;
+ u32 offset;
DAPL_CHECK_NULL(_DaplBucketCacheGet(), -EINVAL);
DAPL_CHECK_NULL(table, -EINVAL);
@@ -304,10 +306,11 @@
/* ========================================================================= */
/*..DaplHashTableRemoveValue -- remove all entries with a given value */
-tINT32 DaplHashTableRemoveValue(DAPL_HASH_TABLE table, unsigned long value) {
+s32 DaplHashTableRemoveValue(DAPL_HASH_TABLE table, unsigned long value)
+{
DAPL_HASH_BUCKET next;
DAPL_HASH_BUCKET bucket;
- tINT32 offset;
+ s32 offset;
DAPL_CHECK_NULL(_DaplBucketCacheGet(), -EINVAL);
DAPL_CHECK_NULL(table, -EINVAL);
@@ -345,15 +348,14 @@
/* ========================================================================= */
/*..DaplHashTableDump -- dump the contents of the hash table */
-tINT32 DaplHashTableDump
- (DAPL_HASH_TABLE table,
- DAPL_HASH_DUMP_FUNC dfunc,
- char *buffer, tINT32 max_size, tINT32 start, tINT32 * end) {
+s32 DaplHashTableDump(DAPL_HASH_TABLE table, DAPL_HASH_DUMP_FUNC dfunc,
+ char *buffer, s32 max_size, s32 start, s32 * end)
+{
DAPL_HASH_BUCKET bucket;
- tINT32 offset = 0;
- tINT32 elements;
- tINT32 counter;
- tINT32 result;
+ s32 offset = 0;
+ s32 elements;
+ s32 counter;
+ s32 result;
DAPL_CHECK_NULL(table, -EINVAL);
DAPL_CHECK_NULL(buffer, -EINVAL);
Index: drivers/infiniband/ulp/dapl/khash.h
===================================================================
--- drivers/infiniband/ulp/dapl/khash.h (revision 615)
+++ drivers/infiniband/ulp/dapl/khash.h (working copy)
@@ -39,9 +39,9 @@
* bytes written into buffer, a negative return means that data will not
* fit into max_size bytes.
*/
-typedef tINT32(*DAPL_HASH_DUMP_FUNC) (char *buffer,
- tINT32 max_size,
- char *key, tUINT32 value);
+typedef s32(*DAPL_HASH_DUMP_FUNC) (char *buffer,
+ s32 max_size,
+ char *key, u32 value);
/*
* A simple hash table.
*/
@@ -53,31 +53,31 @@
};
struct DAPL_HASH_TABLE_STRUCT {
- tINT32 size; /* size of hash table */
- tINT32 num_entries; /* number of entries in hash table */
- tUINT64 mask; /* mask used for computing the hash */
- tINT32 num_collisions; /* number of collisions (useful for stats) */
+ s32 size; /* size of hash table */
+ s32 num_entries; /* number of entries in hash table */
+ u64 mask; /* mask used for computing the hash */
+ s32 num_collisions; /* number of collisions (useful for stats) */
DAPL_HASH_BUCKET *buckets; /* room for pointers to entries */
};
-DAPL_HASH_TABLE DaplHashTableCreate(tINT32 size);
+DAPL_HASH_TABLE DaplHashTableCreate(s32 size);
-tINT32 DaplHashTableDestroy(DAPL_HASH_TABLE table);
+s32 DaplHashTableDestroy(DAPL_HASH_TABLE table);
-tINT32 DaplHashTableInsert(DAPL_HASH_TABLE table,
- char *key, unsigned long value);
+s32 DaplHashTableInsert(DAPL_HASH_TABLE table,
+ char *key, unsigned long value);
-tINT32 DaplHashTableLookup(DAPL_HASH_TABLE table,
- char *key, unsigned long *value);
+s32 DaplHashTableLookup(DAPL_HASH_TABLE table,
+ char *key, unsigned long *value);
-tINT32 DaplHashTableRemove(DAPL_HASH_TABLE table,
- char *key, unsigned long *value);
+s32 DaplHashTableRemove(DAPL_HASH_TABLE table,
+ char *key, unsigned long *value);
-tINT32 DaplHashTableRemoveValue(DAPL_HASH_TABLE table, unsigned long value);
+s32 DaplHashTableRemoveValue(DAPL_HASH_TABLE table, unsigned long value);
-tINT32 DaplHashTableDump(DAPL_HASH_TABLE table,
- DAPL_HASH_DUMP_FUNC dfunc,
- char *buffer,
- tINT32 max_size, tINT32 start, tINT32 * end);
+s32 DaplHashTableDump(DAPL_HASH_TABLE table,
+ DAPL_HASH_DUMP_FUNC dfunc,
+ char *buffer,
+ s32 max_size, s32 start, s32 *end);
#endif /* _KHASH_H */
Index: drivers/infiniband/ulp/dapl/udapl_mod.c
===================================================================
--- drivers/infiniband/ulp/dapl/udapl_mod.c (revision 615)
+++ drivers/infiniband/ulp/dapl/udapl_mod.c (working copy)
@@ -58,9 +58,9 @@
#define SMR_DB_SIZE 256 /* Keep this a power of 2. Max is 4096 */
#define MAX_SMR_PER_PROCESS 256
#define MAX_MRH_PER_SMR 512
-#define MRH_INDEX_INVALID ((tINT32) ~0)
+#define MRH_INDEX_INVALID ((s32) ~0)
#define MAX_WO_PER_PROCESS 256
-#define TS_TIMEOUT_INFINITE ((tINT32) ~0)
+#define TS_TIMEOUT_INFINITE ((s32) ~0)
#define SMR_COOKIE_SIZE 40
#define ATS_TIMEOUT (2*HZ)
#define ATS_RETRIES 15
@@ -78,7 +78,7 @@
struct semaphore sem;
struct ib_path_record *user_path_record;
struct ib_path_record path_record;
- tINT32 status;
+ s32 status;
pr_entry_t *next;
};
@@ -86,8 +86,8 @@
struct ats_entry_s {
struct semaphore sem;
- uint8_t info[16];
- tINT32 status;
+ u8 info[16];
+ s32 status;
ats_entry_t *next;
};
@@ -95,16 +95,16 @@
struct ats_cache_rec_s {
unsigned long created;
- uint8_t ip_addr[16];
- uint8_t gid[16];
+ u8 ip_addr[16];
+ u8 gid[16];
};
typedef struct ats_advert_s ats_advert_t;
struct ats_advert_s {
- uint8_t ip_addr[16];
- uint8_t gid[16];
- tUINT32 set_flag;
+ u8 ip_addr[16];
+ u8 gid[16];
+ u32 set_flag;
struct ib_device *ts_hca_handle;
};
@@ -121,8 +121,8 @@
struct smr_rec_s {
VAPI_mr_hndl_t *mrh_array;
- tINT32 ref_count;
- tINT32 initialized;
+ s32 ref_count;
+ s32 initialized;
char cookie[SMR_COOKIE_SIZE];
smr_rec_t *next;
};
@@ -131,7 +131,7 @@
struct smr_clean_info_s {
smr_rec_t *smr_rec;
- tUINT32 mrh_index;
+ u32 mrh_index;
};
typedef struct resources_s resources_t;
@@ -139,7 +139,7 @@
struct resources_s {
wo_entry_t **wo_entries;
smr_clean_info_t *smr_clean_info;
- tUINT32 shmem_sem_flag;
+ u32 shmem_sem_flag;
};
static int udapl_major_number = 245;
@@ -161,7 +161,7 @@
static spinlock_t ats_advert_lock = SPIN_LOCK_UNLOCKED;
static ats_cache_rec_t ats_cache[ATS_CACHE_SIZE];
-static tUINT32 ats_cache_last;
+static u32 ats_cache_last;
static spinlock_t ats_cache_lock = SPIN_LOCK_UNLOCKED;
static void *pr_area;
@@ -582,7 +582,7 @@
/* ATS processing */
/* ------------------------------------------------------------------------- */
-static tUINT32 find_hca(struct ib_device *ts_hca_handle)
+static u32 find_hca(struct ib_device *ts_hca_handle)
{
int i;
@@ -595,10 +595,10 @@
return i;
}
-static void ats_cache_insert(uint8_t * ip_addr, uint8_t * gid, tINT32 what)
+static void ats_cache_insert(u8 *ip_addr, u8 *gid, s32 what)
{
unsigned long flags;
- tUINT32 entry_n;
+ u32 entry_n;
spin_lock_irqsave(&ats_cache_lock, flags);
@@ -652,10 +652,10 @@
return;
}
-static tINT32 ats_cache_lookup(uint8_t * ip_addr, uint8_t * gid, tINT32 what)
+static s32 ats_cache_lookup(u8 *ip_addr, u8 *gid, s32 what)
{
unsigned long flags;
- tUINT32 entry_n;
+ u32 entry_n;
spin_lock_irqsave(&ats_cache_lock, flags);
@@ -790,13 +790,13 @@
}
-static tINT32 ats_gid_lookup(uint8_t * ip_addr, uint8_t * gid,
- void *ts_hca_handle, uint8_t port)
+static s32 ats_gid_lookup(u8 *ip_addr, u8 *gid,
+ void *ts_hca_handle, u8 port)
{
- tINT32 status;
+ s32 status;
ats_entry_t *ats_entry;
tTS_IB_CLIENT_QUERY_TID tid;
- tUINT32 count;
+ u32 count;
TS_REPORT_STAGE(MOD_UDAPL,
"Looking up GID for IP: %hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd.%hd on port %hd",
@@ -940,15 +940,15 @@
}
-static tINT32 ats_ipaddr_lookup(struct file *fp, unsigned long arg)
+static s32 ats_ipaddr_lookup(struct file *fp, unsigned long arg)
{
ats_ipaddr_lookup_param_t param;
- tINT32 status;
- uint8_t gid[16];
- uint8_t ip_addr[16];
+ s32 status;
+ u8 gid[16];
+ u8 ip_addr[16];
ats_entry_t *ats_entry;
tTS_IB_CLIENT_QUERY_TID tid;
- tUINT32 count;
+ u32 count;
if (!arg) {
@@ -1116,13 +1116,13 @@
return;
}
-static tINT32 ats_do_set_ipaddr(uint8_t * ip_addr, uint8_t * gid,
- void *ts_hca_handle, uint8_t port)
+static s32 ats_do_set_ipaddr(u8 *ip_addr, u8 *gid,
+ void *ts_hca_handle, u8 port)
{
ats_entry_t *ats_entry;
tTS_IB_CLIENT_QUERY_TID tid;
- tUINT32 count;
- tINT32 status;
+ u32 count;
+ s32 status;
ats_entry = get_free_ats_entry();
@@ -1213,14 +1213,14 @@
return status;
}
-static tINT32 ats_set_ipaddr(struct file *fp, unsigned long arg)
+static s32 ats_set_ipaddr(struct file *fp, unsigned long arg)
{
ats_set_ipaddr_param_t param;
- tINT32 status;
- uint8_t gid[16];
- uint8_t ip_addr[16];
+ s32 status;
+ u8 gid[16];
+ u8 ip_addr[16];
unsigned long flags;
- tUINT32 hca_i, port_i;
+ u32 hca_i, port_i;
if (!arg) {
@@ -1312,9 +1312,9 @@
static void async_event_handler(struct ib_async_event_record *event, void *arg)
{
- tINT32 status;
+ s32 status;
unsigned long flags;
- tUINT32 hca_i, port_i;
+ u32 hca_i, port_i;
switch (event->event) {
@@ -1426,11 +1426,11 @@
return;
}
-static tINT32 gid_path_record_comp(tIP2PR_PATH_LOOKUP_ID plid,
- tINT32 status,
- tTS_IB_PORT hw_port,
- struct ib_device *ca,
- struct ib_path_record *path, void *usr_arg)
+static s32 gid_path_record_comp(tIP2PR_PATH_LOOKUP_ID plid,
+ s32 status,
+ tTS_IB_PORT hw_port,
+ struct ib_device *ca,
+ struct ib_path_record *path, void *usr_arg)
{
pr_entry_t *pr_entry;
@@ -1473,13 +1473,13 @@
return -1;
}
-static tINT32 ip_path_record_comp(tIP2PR_PATH_LOOKUP_ID plid,
- tINT32 status,
- tUINT32 src_addr,
- tUINT32 dst_addr,
- tTS_IB_PORT hw_port,
- struct ib_device *ca,
- struct ib_path_record *path, void *usr_arg)
+static s32 ip_path_record_comp(tIP2PR_PATH_LOOKUP_ID plid,
+ s32 status,
+ u32 src_addr,
+ u32 dst_addr,
+ tTS_IB_PORT hw_port,
+ struct ib_device *ca,
+ struct ib_path_record *path, void *usr_arg)
{
pr_entry_t *pr_entry;
@@ -1522,17 +1522,17 @@
return -1;
}
-static tINT32 get_path_record(struct file *fp, unsigned long arg)
+static s32 get_path_record(struct file *fp, unsigned long arg)
{
path_record_param_t param;
- tINT32 status;
+ s32 status;
pr_entry_t *pr_entry;
tIP2PR_PATH_LOOKUP_ID plid;
- uint8_t dst_ip_addr[16];
- uint8_t src_gid[16];
- uint8_t dst_gid[16];
+ u8 dst_ip_addr[16];
+ u8 src_gid[16];
+ u8 dst_gid[16];
u16 pkey;
- tUINT32 dst_addr;
+ u32 dst_addr;
if (!arg) {
@@ -1742,7 +1742,7 @@
{
unsigned long flags;
smr_rec_t *smr_rec;
- tUINT32 i;
+ u32 i;
TS_ENTER(MOD_UDAPL);
@@ -1781,14 +1781,14 @@
return smr_rec;
}
-static tINT32 smr_insert(struct file *fp, unsigned long arg)
+static s32 smr_insert(struct file *fp, unsigned long arg)
{
smr_insert_param_t param;
- tINT32 status;
+ s32 status;
unsigned long flags;
smr_rec_t *smr_rec;
smr_clean_info_t *smr_clean_info;
- tUINT32 smr_n;
+ u32 smr_n;
TS_ENTER(MOD_UDAPL);
@@ -1887,15 +1887,15 @@
return status;
}
-static tINT32 smr_add_mrh(struct file *fp, unsigned long arg)
+static s32 smr_add_mrh(struct file *fp, unsigned long arg)
{
smr_add_mrh_param_t param;
- tINT32 status;
+ s32 status;
unsigned long flags;
smr_rec_t *smr_rec;
smr_clean_info_t *smr_clean_info;
- tUINT32 i;
- tUINT32 smr_n;
+ u32 i;
+ u32 smr_n;
char cookie[SMR_COOKIE_SIZE];
char cookie_str[SMR_COOKIE_SIZE + 1];
@@ -1996,15 +1996,15 @@
return status;
}
-static tINT32 smr_del_mrh(struct file *fp, unsigned long arg)
+static s32 smr_del_mrh(struct file *fp, unsigned long arg)
{
smr_del_mrh_param_t param;
- tINT32 status;
+ s32 status;
unsigned long flags;
smr_rec_t *smr_rec;
smr_clean_info_t *smr_clean_info;
- tUINT32 i;
- tUINT32 smr_n;
+ u32 i;
+ u32 smr_n;
char cookie[SMR_COOKIE_SIZE];
char cookie_str[SMR_COOKIE_SIZE + 1];
@@ -2113,15 +2113,15 @@
return status;
}
-static tINT32 smr_query(struct file *fp, unsigned long arg)
+static s32 smr_query(struct file *fp, unsigned long arg)
{
smr_query_param_t param;
- tINT32 status;
+ s32 status;
unsigned long flags;
smr_rec_t *smr_rec;
smr_clean_info_t *smr_clean_info;
- tUINT32 smr_n;
- tUINT32 i;
+ u32 smr_n;
+ u32 i;
char cookie[SMR_COOKIE_SIZE];
char cookie_str[SMR_COOKIE_SIZE + 1];
@@ -2228,14 +2228,14 @@
return status;
}
-static tINT32 smr_dec(struct file *fp, unsigned long arg)
+static s32 smr_dec(struct file *fp, unsigned long arg)
{
smr_insert_param_t param;
- tINT32 status;
+ s32 status;
unsigned long flags;
smr_rec_t *smr_rec;
smr_clean_info_t *smr_clean_info;
- tUINT32 smr_n;
+ u32 smr_n;
char cookie[SMR_COOKIE_SIZE];
char cookie_str[SMR_COOKIE_SIZE + 1];
@@ -2343,10 +2343,10 @@
static void smr_clean(smr_clean_info_t * smr_clean_info)
{
- tUINT32 smr_n;
+ u32 smr_n;
unsigned long flags;
smr_rec_t *cur_smr;
- tINT32 status;
+ s32 status;
TS_ENTER(MOD_UDAPL);
@@ -2401,7 +2401,7 @@
spin_unlock_irqrestore(&smr_db_lock, flags);
}
-static tINT32 smr_mutex_lock(struct file *fp)
+static s32 smr_mutex_lock(struct file *fp)
{
TS_ENTER(MOD_UDAPL);
@@ -2411,7 +2411,7 @@
return 0;
}
-static tINT32 smr_mutex_unlock(struct file *fp)
+static s32 smr_mutex_unlock(struct file *fp)
{
TS_ENTER(MOD_UDAPL);
@@ -2429,13 +2429,13 @@
/* Misc. helper ioctls */
/* ------------------------------------------------------------------------- */
-static tINT32 get_hca_ipaddr(struct file *fp, unsigned long arg)
+static s32 get_hca_ipaddr(struct file *fp, unsigned long arg)
{
get_hca_ipaddr_param_t param;
- tINT32 status;
- uint8_t gid[16];
- uint8_t dev_gid[16];
- tINT32 i;
+ s32 status;
+ u8 gid[16];
+ u8 dev_gid[16];
+ s32 i;
struct net_device *dev;
struct in_device *inet_dev;
struct ib_device *ca;
@@ -2645,7 +2645,7 @@
static int udapl_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
unsigned long arg)
{
- tINT32 status;
+ s32 status;
if ((_IOC_TYPE(cmd) != T_IOC_MAGIC) || (_IOC_NR(cmd) > T_IOC_MAXNR) ||
(fp->private_data == NULL)) {
@@ -2841,7 +2841,7 @@
}
-static tINT32 reg_dev(void)
+static s32 reg_dev(void)
{
static struct file_operations udapl_fops = {
owner:THIS_MODULE,
@@ -2850,7 +2850,7 @@
read:udapl_read,
release:udapl_close,
};
- tINT32 result;
+ s32 result;
result =
register_chrdev(udapl_major_number, UDAPL_DEVNAME, &udapl_fops);
@@ -2875,8 +2875,8 @@
static int __init udapl_init_module(void)
{
- tINT32 status;
- tINT32 entry_n;
+ s32 status;
+ s32 entry_n;
pr_entry_t *pr_entry;
ats_entry_t *ats_entry;
wo_entry_t *wo_entry;
@@ -3029,7 +3029,7 @@
static void udapl_cleanup_module(void)
{
- tINT32 status;
+ s32 status;
kfree(wo_area);
kfree(pr_area);
Index: drivers/infiniband/ulp/dapl/udapl_mod.h
===================================================================
--- drivers/infiniband/ulp/dapl/udapl_mod.h (revision 615)
+++ drivers/infiniband/ulp/dapl/udapl_mod.h (working copy)
@@ -59,17 +59,17 @@
} clear_comp_eventh_param_t;
typedef struct path_record_param_s {
- uint8_t *dst_ip_addr;
- uint8_t *src_gid;
+ u8 *dst_ip_addr;
+ u8 *src_gid;
void *ts_hca_handle;
- uint8_t port;
- tUINT32 ats_flag;
+ u8 port;
+ u32 ats_flag;
struct ib_path_record *path_record;
} path_record_param_t;
typedef struct smr_insert_param_s {
void *cookie;
- tUINT32 exists;
+ u32 exists;
} smr_insert_param_t;
typedef struct smr_add_mrh_param_s {
@@ -84,7 +84,7 @@
typedef struct smr_query_param_s {
void *cookie;
- tUINT32 ready;
+ u32 ready;
VAPI_mr_hndl_t mr_handle;
} smr_query_param_t;
@@ -93,22 +93,22 @@
} smr_dec_param_t;
typedef struct ats_ipaddr_lookup_param_s {
- uint8_t *gid;
+ u8 *gid;
void *ts_hca_handle;
- uint8_t port;
- uint8_t *ip_addr;
+ u8 port;
+ u8 *ip_addr;
} ats_ipaddr_lookup_param_t;
typedef struct ats_set_ipaddr_param_s {
- uint8_t *gid;
+ u8 *gid;
void *ts_hca_handle;
- uint8_t port;
- uint8_t *ip_addr;
+ u8 port;
+ u8 *ip_addr;
} ats_set_ipaddr_param_t;
typedef struct get_hca_ipaddr_param_s {
- uint8_t *gid;
- uint32_t ip_addr;
+ u8 *gid;
+ u3t ip_addr;
} get_hca_ipaddr_param_t;
#define T_IOC_MAGIC 92
Index: drivers/infiniband/ulp/ipoib/ip2pr_mod.c
===================================================================
--- drivers/infiniband/ulp/ipoib/ip2pr_mod.c (revision 615)
+++ drivers/infiniband/ulp/ipoib/ip2pr_mod.c (working copy)
@@ -27,19 +27,19 @@
MODULE_DESCRIPTION("IB path record lookup module");
MODULE_LICENSE("Dual BSD/GPL");
-extern tINT32 tsIp2prLinkAddrInit(void
+extern s32 tsIp2prLinkAddrInit(void
);
-extern tINT32 tsIp2prLinkAddrCleanup(void
+extern s32 tsIp2prLinkAddrCleanup(void
);
-extern tINT32 _tsIp2prUserLookup(unsigned long arg);
-extern tINT32 _tsGid2prUserLookup(unsigned long arg);
-extern tINT32 tsIp2prProcFsInit(void
+extern s32 _tsIp2prUserLookup(unsigned long arg);
+extern s32 _tsGid2prUserLookup(unsigned long arg);
+extern s32 tsIp2prProcFsInit(void
);
-extern tINT32 tsIp2prProcFsCleanup(void
+extern s32 tsIp2prProcFsCleanup(void
);
-extern tINT32 tsIp2prSrcGidInit(void
+extern s32 tsIp2prSrcGidInit(void
);
-extern tINT32 tsIp2prSrcGidCleanup(void
+extern s32 tsIp2prSrcGidCleanup(void
);
static int ip2pr_major_number = 240;
@@ -103,7 +103,7 @@
/*..prlookup_init -- initialize the PathRecord Lookup host module */
int __init tsIp2prDriverInitModule(void
) {
- tINT32 result = 0;
+ s32 result = 0;
TS_TRACE(MOD_IP2PR, T_VERBOSE, TRACE_FLOW_INOUT,
"INIT: Path Record Lookup module load.");
Index: drivers/infiniband/ulp/srp/srp_host.c
===================================================================
--- drivers/infiniband/ulp/srp/srp_host.c (revision 615)
+++ drivers/infiniband/ulp/srp/srp_host.c (working copy)
@@ -26,7 +26,7 @@
MODULE_PARM(dlid_conf, "i");
MODULE_PARM_DESC(dlid_conf,
"dlid_conf (nonzero value indicates that dlid is being specified in the conf file)");
-tUINT32 dlid_conf = 0;
+u32 dlid_conf = 0;
MODULE_PARM(service_str, "s");
MODULE_PARM_DESC(service_str, "used with dlid_conf, in stand alone systems");
@@ -35,7 +35,7 @@
MODULE_PARM(ib_ports_mask, "i");
MODULE_PARM_DESC(ib_ports_mask,
"bit mask to enable or disable SRP usage of local IB ports 1 - use port1 only, 2 - use port2 only, 3 - use both ports");
-tUINT32 ib_ports_mask = 0xffffffff;
+u32 ib_ports_mask = 0xffffffff;
MODULE_PARM(max_luns, "i");
MODULE_PARM_DESC(max_luns,
@@ -67,7 +67,7 @@
MODULE_PARM(srp_discovery_timeout, "i");
MODULE_PARM_DESC(srp_discovery_timeout,
"timeout (in seconds) for SRP discovery (of SRP targets) to complete");
-tUINT32 srp_discovery_timeout = IB_DISCOVERY_TIMEOUT; /* 60 seconds */
+u32 srp_discovery_timeout = IB_DISCOVERY_TIMEOUT; /* 60 seconds */
MODULE_PARM(fmr_cache, "i");
MODULE_PARM_DESC(fmr_cache, "size of cached fmr entries");
@@ -406,7 +406,7 @@
} else if (srp_pkt->in_use == TRUE) {
srp_pkt->scatter_gather_list.address =
- (uint64_t) (unsigned long)srp_pkt->data;
+ (u64) (unsigned long)srp_pkt->data;
srp_pkt->scatter_gather_list.length = srp_cmd_pkt_size;
srp_pkt->in_use = FALSE;
srp_pkt->conn = INVALID_CONN_HANDLE;
@@ -437,7 +437,7 @@
} else if (srp_pkt->in_use == TRUE) {
srp_pkt->scatter_gather_list.address =
- (uint64_t) (unsigned long)srp_pkt->data;
+ (u64) (unsigned long)srp_pkt->data;
srp_pkt->scatter_gather_list.length = srp_cmd_pkt_size;
srp_pkt->in_use = FALSE;
srp_pkt->conn = INVALID_CONN_HANDLE;
@@ -632,7 +632,7 @@
srp_pkt->target = target;
srp_pkt->data = srp_pkt_data;
srp_pkt->scatter_gather_list.address =
- (uint64_t) (unsigned long) srp_pkt_data;
+ (u64) (unsigned long) srp_pkt_data;
srp_pkt->scatter_gather_list.length = srp_cmd_pkt_size;
if (pkt_num == max_num_pkts - 1)
@@ -815,7 +815,7 @@
* Reclaim memory registrations
*/
if (ioq->sr_list) {
- uint32_t sr_list_index = 0;
+ u32 sr_list_index = 0;
for (; sr_list_index < ioq->sr_list_length;
sr_list_index++) {
srptp_dereg_phys_host_buf(ioq->sr_list +
@@ -1638,8 +1638,8 @@
int i;
srp_target_t *target;
int not_first_entry = FALSE;
- uint8_t *gid;
- uint8_t *ioc_guid;
+ u8 *gid;
+ u8 *ioc_guid;
char *buf;
if (inout == TRUE) {
@@ -1917,7 +1917,7 @@
{
srp_host_conn_t *s;
srp_resp_t *resphdr;
- tUINT32 resp_code;
+ u32 resp_code;
ioq_t *ioq = NULL;
ioq_t *next_ioq = NULL;
ioq_t *cmd_ioq;
@@ -1927,7 +1927,7 @@
#if DBG_IGNORE_WRITE
resphdr = (srp_resp_t *) pkt->data;
- ioq = (ioq_t *) (tUINT32) (be64_to_cpu(resphdr->tag));
+ ioq = (ioq_t *) (u32) (be64_to_cpu(resphdr->tag));
if (ioq->req) {
scsi_cmnd = (Scsi_Cmnd *) ioq->req;
if (scsi_cmnd->cmnd[0] == 0x2A) {
@@ -1968,7 +1968,7 @@
* does not occur.
*/
TS_REPORT_WARN(MOD_SRPTP, "NULL request queue, for tag %x",
- (tUINT32) resphdr->tag);
+ (u32) resphdr->tag);
spin_unlock_irqrestore(&target->spin_lock, cpu_flags);
return 0;
@@ -2021,7 +2021,7 @@
if (resphdr->status.bit.rspvalid) {
/* response data */
- resp_code = ((tUINT8 *) (resphdr + 1))[3];
+ resp_code = ((u8 *) (resphdr + 1))[3];
switch (resp_code) {
case NO_FAILURE:
@@ -2379,7 +2379,7 @@
srp_host_hca_params_t *hca = target->port->hca;
if (ioq->sr_list) {
- uint32_t sr_list_index = 0;
+ u32 sr_list_index = 0;
for (; sr_list_index < ioq->sr_list_length;
sr_list_index++) {
srptp_dereg_phys_host_buf(ioq->sr_list +
@@ -2462,7 +2462,7 @@
if (status) {
/* we have a problem posting, disconnect, never should happen */
if (ioq->sr_list) {
- uint32_t sr_list_index = 0;
+ u32 sr_list_index = 0;
for (; sr_list_index < ioq->sr_list_length;
sr_list_index++) {
srptp_dereg_phys_host_buf(ioq->sr_list +
@@ -2760,7 +2760,7 @@
TS_REPORT_STAGE(MOD_SRPTP, "Sending Login request for conn %p", s);
TS_REPORT_STAGE(MOD_SRPTP, "SRP Initiator GUID: %llx",
- be64_to_cpu(*(tUINT64 *) & s->port->hca->I_PORT_ID[8]));
+ be64_to_cpu(*(u64 *) & s->port->hca->I_PORT_ID[8]));
s->login_buff_len = sizeof(srp_login_req_t);
header = (srp_login_req_t *) s->login_buff;
@@ -2897,7 +2897,7 @@
TS_REPORT_STAGE(MOD_SRPTP,
"sense_buffer[%d] %x",
i,
- *((tUINT32 *) &
+ *((u32 *) &
sense_buffer[i]));
}
TS_REPORT_STAGE(MOD_SRPTP,
@@ -2925,7 +2925,7 @@
* we are going to need to free the response packet, and structures
* to point to the host buffers */
if (cmnd->request_bufflen) {
- uint32_t sr_list_index = 0;
+ u32 sr_list_index = 0;
sr_list = ioq->sr_list;
@@ -2960,13 +2960,13 @@
srp_remote_buf_t *curr_buff_descriptor =
&header->partial_memory_descriptor_list[0];
- uint32_t total_length = 0;
+ u32 total_length = 0;
dma_addr_t curr_dma_addr, base_dma_addr;
- tUINT32 curr_registration_length = 0, curr_dma_length = 0;
+ u32 curr_registration_length = 0, curr_dma_length = 0;
- uint64_t *dma_addr_list;
- tUINT32 dma_addr_index = 0;
+ u64 *dma_addr_list;
+ u32 dma_addr_index = 0;
int status;
srp_host_buf_t *sr_list;
@@ -2985,8 +2985,8 @@
sr_list->data = NULL;
- dma_addr_list = (uint64_t *)
- kmalloc(sizeof(uint64_t) *
+ dma_addr_list = (u64 *)
+ kmalloc(sizeof(u64) *
((max_xfer_sectors_per_io * 512 / PAGE_SIZE) + 2),
GFP_ATOMIC);
if (dma_addr_list == NULL) {
@@ -3043,7 +3043,7 @@
* Register the current region
*/
sr_list->size = curr_registration_length;
- sr_list->r_addr = (uint64_t) (unsigned long)sr_list->data;
+ sr_list->r_addr = (u64) (unsigned long)sr_list->data;
status = srptp_register_memory(srp_pkt->conn,
sr_list,
@@ -3122,9 +3122,9 @@
header->total_length = cpu_to_be32(total_length);
if (srp_cmd_frame->dofmt)
- srp_cmd_frame->docount = (tUINT8) (*sr_list_length);
+ srp_cmd_frame->docount = (u8) (*sr_list_length);
else if (srp_cmd_frame->difmt)
- srp_cmd_frame->dicount = (tUINT8) (*sr_list_length);
+ srp_cmd_frame->dicount = (u8) (*sr_list_length);
else
srp_cmd_frame->dicount = srp_cmd_frame->docount = 0;
@@ -3150,8 +3150,8 @@
int sg_cnt;
int num_sg_elements;
int offset, max_phys_pages, page_offset;
- uint64_t *phys_buffer_list;
- uint64_t new_phys_page, old_phys_page;
+ u64 *phys_buffer_list;
+ u64 new_phys_page, old_phys_page;
int status, buf_len, num_phys_pages, old_buf_len;
TS_REPORT_DATA(MOD_SRPTP, "sg cnt = %d buffer %p phys %lx",
@@ -3207,7 +3207,7 @@
sr_list->data =
(void *)(unsigned long) sg_dma_address(&st_buffer[0]);
sr_list->r_addr = (unsigned long) sr_list->data;
- sr_list->size = (uint32_t) cmnd->request_bufflen;
+ sr_list->size = (u32) cmnd->request_bufflen;
/*
* compute the number of physical pages
@@ -3220,7 +3220,7 @@
*/
max_phys_pages = cmnd->request_bufflen / PAGE_SIZE;
page_offset =
- (uint32_t) sg_dma_address(&st_buffer[0]) & (PAGE_SIZE - 1);
+ (u32) sg_dma_address(&st_buffer[0]) & (PAGE_SIZE - 1);
if (page_offset) {
max_phys_pages++;
if ((PAGE_SIZE - page_offset) <
@@ -3231,7 +3231,7 @@
}
phys_buffer_list =
- (uint64_t *) kmalloc(sizeof(uint64_t) * max_phys_pages, GFP_ATOMIC);
+ (u64 *) kmalloc(sizeof(u64) * max_phys_pages, GFP_ATOMIC);
if (phys_buffer_list == NULL) {
TS_REPORT_WARN(MOD_SRPTP, "phys buffer list allocation failed");
kfree(sr_list);
@@ -3265,7 +3265,7 @@
*/
for (sg_cnt = 0; sg_cnt < num_sg_elements; sg_cnt++) {
- new_phys_page = (uint32_t) sg_dma_address(&st_buffer[sg_cnt]);
+ new_phys_page = (u32) sg_dma_address(&st_buffer[sg_cnt]);
buf_len = sg_dma_len(&st_buffer[sg_cnt]);
TS_REPORT_DATA(MOD_SRPTP, "virtual[%x] %llx len %x", sg_cnt,
@@ -3274,7 +3274,7 @@
for (sg_cnt = 0; sg_cnt < num_sg_elements; sg_cnt++) {
- new_phys_page = (uint32_t) sg_dma_address(&st_buffer[sg_cnt]);
+ new_phys_page = (u32) sg_dma_address(&st_buffer[sg_cnt]);
buf_len = sg_dma_len(&st_buffer[sg_cnt]);
TS_REPORT_DATA(MOD_SRPTP, "virtual[%x] %llx len %x", sg_cnt,
@@ -3313,7 +3313,7 @@
"aligned at end and not last");
TS_REPORT_FATAL(MOD_SRPTP,
"next addr 0x%x len 0x%x",
- (uint32_t) (sg_dma_address
+ (u32) (sg_dma_address
(&st_buffer
[sg_cnt + 1])),
sg_dma_len(&st_buffer
Index: drivers/infiniband/ulp/srp/srp_dm.c
===================================================================
--- drivers/infiniband/ulp/srp/srp_dm.c (revision 615)
+++ drivers/infiniband/ulp/srp/srp_dm.c (working copy)
@@ -53,7 +53,7 @@
if (ioc_table[i].valid == FALSE) {
TS_REPORT_STAGE(MOD_SRPTP,
"Creating IOC Entry %d for 0x%llx", i,
- be64_to_cpu(*(uint64_t *) guid));
+ be64_to_cpu(*(u64 *) guid));
memcpy(ioc_table[i].guid, guid, sizeof(tTS_IB_GUID));
ioc_table[i].valid = TRUE;
@@ -97,7 +97,7 @@
if (path_available == FALSE) {
TS_REPORT_WARN(MOD_SRPTP, "IOC GUID %llx, no available paths",
- be64_to_cpu(*(uint64_t *) ioc->guid));
+ be64_to_cpu(*(u64 *) ioc->guid));
/*
* no paths available to this IOC, let's remove it from our
@@ -331,7 +331,7 @@
return (TS_FAIL);
}
-int srp_find_query(srp_host_port_params_t * port, uint8_t * gid)
+int srp_find_query(srp_host_port_params_t *port, u8 *gid)
{
unsigned long cpu_flags;
struct list_head *temp_entry;
@@ -403,8 +403,8 @@
{
struct list_head *cur;
char *service_name_str;
- uint64_t service_id;
- uint64_t service_name_cpu_endian, service_name;
+ u64 service_id;
+ u64 service_name_cpu_endian, service_name;
int ioc_index = 0;
int svc_index = 0;
ioc_entry_t *ioc_entry;
@@ -436,8 +436,8 @@
service_name = cpu_to_be64(service_name_cpu_endian);
service_id =
- be64_to_cpu(*(uint64_t *) io_svc->svc_entry.service_id);
- if (service_id != ((uint64_t) (SRP_SERVICE_ID))) {
+ be64_to_cpu(*(u64 *) io_svc->svc_entry.service_id);
+ if (service_id != ((u64) (SRP_SERVICE_ID))) {
TS_REPORT_WARN(MOD_SRPTP,
"Invalid service id 0x%llx "
"(expected 0x%llx) from DM Client\n",
@@ -454,7 +454,7 @@
TS_REPORT_STAGE(MOD_SRPTP,
"IOC not found %llx, creating new "
"IOC entry",
- be64_to_cpu(*(uint64_t *) io_svc->
+ be64_to_cpu(*(u64 *) io_svc->
controller_guid));
status =
@@ -714,7 +714,7 @@
static struct ib_path_record *srp_empty_path_record_cache(void)
{
- uint32_t index;
+ u32 index;
struct ib_path_record unused_path_record;
@@ -736,10 +736,9 @@
return NULL;
}
-static void srp_flush_path_record_cache(srp_host_port_params_t * port,
- uint8_t * gid)
+static void srp_flush_path_record_cache(srp_host_port_params_t *port, u8 *gid)
{
- uint32_t index;
+ u32 index;
unsigned long cpu_flags;
TS_REPORT_STAGE(MOD_SRPTP, "Flushing path record cache");
@@ -951,7 +950,7 @@
struct ib_device *dev_hndl,
tTS_IB_PORT local_port, u16 io_port_lid, void *arg)
{
- uint8_t *notified_port_gid = notice->detail.sm_trap.gid;
+ u8 *notified_port_gid = notice->detail.sm_trap.gid;
int hca_index;
srp_host_hca_params_t *hca;
srp_host_port_params_t *port;
@@ -1043,7 +1042,7 @@
{
srp_host_port_params_t *srp_port = (srp_host_port_params_t *) arg;
- uint8_t *notified_port_gid = notice->detail.sm_trap.gid;
+ u8 *notified_port_gid = notice->detail.sm_trap.gid;
srp_query_entry_t *query_entry;
int status;
@@ -1128,10 +1127,10 @@
tTS_IB_PORT local_port, void *arg)
{
- uint8_t *notified_port_gid = notice->detail.sm_trap.gid;
+ u8 *notified_port_gid = notice->detail.sm_trap.gid;
srp_host_port_params_t *port = (srp_host_port_params_t *) arg;
srp_target_t *target;
- uint8_t *r;
+ u8 *r;
TS_REPORT_WARN(MOD_SRPTP,
"Lost GID %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x on HCA %d Port %d",
@@ -1469,7 +1468,7 @@
case IB_PORT_ERROR:
{
- tUINT32 i;
+ u32 i;
int ioc_index;
srp_target_t *target;
unsigned long cpu_flags;
Index: drivers/infiniband/ulp/srp/srp_host.h
===================================================================
--- drivers/infiniband/ulp/srp/srp_host.h (revision 615)
+++ drivers/infiniband/ulp/srp/srp_host.h (working copy)
@@ -138,7 +138,7 @@
/* protection domain handle */
struct ib_pd *pd_hndl;
- tUINT8 I_PORT_ID[16];
+ u8 I_PORT_ID[16];
struct ib_fmr_pool *fmr_pool;
@@ -175,7 +175,7 @@
tTS_KERNEL_THREAD thread;
- tUINT8 I_PORT_ID[16];
+ u8 I_PORT_ID[16];
int dm_shutdown;
@@ -232,7 +232,7 @@
/*
* ---------------------------
*/
- uint64_t r_addr; /* RDMA buffer address to be used by the
+ u64 r_addr; /* RDMA buffer address to be used by the
* target */
u32 r_key;
struct ib_fmr *mr_hndl; /* buffer's memory handle */
@@ -329,15 +329,15 @@
int retry_count;
- uint8_t login_buff[256];
+ u8 login_buff[256];
int login_buff_len;
- uint8_t login_resp_data[256];
+ u8 login_resp_data[256];
int login_resp_len;
- uint8_t redirected_port_gid[16];
+ u8 redirected_port_gid[16];
tTS_IB_CM_COMM_ID comm_id;
@@ -362,7 +362,7 @@
* Data Buffers Mgmt
*/
struct list_head data_buffers_free_list;
- uint8_t *data_buffers_vaddr;
+ u8 *data_buffers_vaddr;
u32 r_key; /* R_Key to be used by the target */
u32 l_key;
struct ib_mr *mr_hndl; /* buffer's memory handle */
@@ -421,7 +421,7 @@
srp_pkt_t *srp_pkt_hdr_area;
/* memory area for SRP packet payloads */
- uint8_t *srp_pkt_data_area;
+ u8 *srp_pkt_data_area;
u32 r_key[MAX_HCAS];
@@ -446,7 +446,7 @@
/*
* IB pathing information
*/
- tUINT64 service_name;
+ u64 service_name;
srp_host_port_params_t *port;
ioc_entry_t *ioc;
@@ -477,7 +477,7 @@
/*
* Counters
*/
- int64_t ios_processed;
+ s64 ios_processed;
} srp_target_t;
@@ -531,11 +531,11 @@
extern void srp_fmr_flush_function(struct ib_fmr_pool *fmr_pool,
void *flush_arg);
-extern tUINT32 parse_parameters(char *parameters);
+extern u32 parse_parameters(char *parameters);
-extern tUINT32 parse_target_binding_parameters(char *parameters);
+extern u32 parse_target_binding_parameters(char *parameters);
-extern int StringToHex64(char *, uint64_t *);
+extern int StringToHex64(char *, u64 *);
extern int srp_host_disconnect_done(srp_host_conn_t * conn, int status);
@@ -597,10 +597,10 @@
* Called by a host SRP driver to register a buffer on the host.
* IN: host buffer
*/
-int srptp_register_memory(srp_host_conn_t * conn,
- srp_host_buf_t * buf,
- tUINT32 offset,
- uint64_t * phys_buffer_list, tUINT32 list_len);
+int srptp_register_memory(srp_host_conn_t *conn,
+ srp_host_buf_t *buf,
+ u32 offset,
+ u64 *phys_buffer_list, u32 list_len);
/*
* Called by a host SRP driver to deregister a buffer on the host.
Index: drivers/infiniband/ulp/srp/srptp.c
===================================================================
--- drivers/infiniband/ulp/srp/srptp.c (revision 615)
+++ drivers/infiniband/ulp/srp/srptp.c (working copy)
@@ -271,7 +271,7 @@
TS_REPORT_STAGE(MOD_SRPTP,
"SRP Initiator GUID: %llx for hca %d",
- be64_to_cpu(*(tUINT64 *) & hca->I_PORT_ID[8]),
+ be64_to_cpu(*(u64 *) & hca->I_PORT_ID[8]),
hca->hca_index + 1);
hca->pd_hndl = ib_alloc_pd(hca->ca_hndl);
@@ -793,11 +793,11 @@
int
srptp_register_memory(srp_host_conn_t * conn,
srp_host_buf_t * buf,
- tUINT32 offset, uint64_t * buffer_list, tUINT32 list_len)
+ u32 offset, u64 * buffer_list, u32 list_len)
{
int status;
u32 l_key;
- uint64_t start_address = (unsigned long) buf->data;
+ u64 start_address = (unsigned long) buf->data;
if (buf == NULL) {
Index: drivers/infiniband/ulp/srp/hostoptions.c
===================================================================
--- drivers/infiniband/ulp/srp/hostoptions.c (revision 615)
+++ drivers/infiniband/ulp/srp/hostoptions.c (working copy)
@@ -129,7 +129,7 @@
*sourceCharsUsedPtr = index;
}
-int StringToHex32(char *stringPtr, tUINT32 * hexptr)
+int StringToHex32(char *stringPtr, u32 * hexptr)
{
int firsttime = 1;
long isError = kNoError;
@@ -165,7 +165,7 @@
return isError;
}
-int StringToHex64(char *stringPtr, uint64_t * hexptr)
+int StringToHex64(char *stringPtr, u64 * hexptr)
{
int firsttime = 1;
long isError = kNoError;
@@ -204,7 +204,7 @@
}
#if 0
-tUINT32 parse_parameters(char *parameters)
+u32 parse_parameters(char *parameters)
{
char *curr_loc;
unsigned long chars_copied = 0;
@@ -212,12 +212,12 @@
char wwn_str[kWWNStringLength + 1];
char guid_str[kGUIDStringLength + 1];
char dlid_str[kDLIDStringLength + 1];
- tUINT64 wwn;
- tUINT64 guid;
- tUINT32 dlid;
+ u64 wwn;
+ u64 guid;
+ u32 dlid;
long result;
- tUINT32 i;
- extern tUINT32 dlid_conf;
+ u32 i;
+ extern u32 dlid_conf;
/* first convert to lower case to make life easier */
ConvertToLowerCase(parameters);
@@ -237,7 +237,7 @@
&chars_copied);
/* printk( "wwn string %s\n", wwn_str ); */
- /* printk( "characters copied %d\n", (tUINT32)chars_copied ); */
+ /* printk( "characters copied %d\n", (u32)chars_copied ); */
if (chars_copied > (kWWNStringLength + 1)) {
return (TS_FAILURE);
} else {
@@ -246,7 +246,7 @@
result = StringToHex64(wwn_str, &wwn);
printk("WWPN %llx ", wwn);
- *(tUINT64 *) & (srp_targets[i].service_name) = cpu_to_be64(wwn);
+ *(u64 *) & (srp_targets[i].service_name) = cpu_to_be64(wwn);
if (result != kNoError)
return (TS_FAILURE);
@@ -261,7 +261,7 @@
printk("guid string %s\n", guid_str);
printk("characters copied %d\n",
- (tUINT32) chars_copied);
+ (u32) chars_copied);
if (chars_copied > (kGUIDStringLength + 1)) {
return (TS_FAILURE);
@@ -270,10 +270,10 @@
}
result = StringToHex64(guid_str, &guid);
- *(tUINT64 *) & (srp_targets[i].guid) =
+ *(u64 *) & (srp_targets[i].guid) =
cpu_to_be64(guid);
printk("GUID %llx\n",
- *(tUINT64 *) & srp_targets[i].guid);
+ *(u64 *) & srp_targets[i].guid);
if (result != kNoError)
return (TS_FAILURE);
@@ -282,7 +282,7 @@
delimeter, &chars_copied);
/* printk( "dlid string %s\n", dlid_str ); */
- /* printk( "characters copied %d\n", (tUINT32)chars_copied ); */
+ /* printk( "characters copied %d\n", (u32)chars_copied ); */
if (chars_copied > (kDLIDStringLength + 1)) {
return (TS_FAILURE);
@@ -306,19 +306,19 @@
}
#endif
-tUINT32 parse_target_binding_parameters(char *parameters)
+u32 parse_target_binding_parameters(char *parameters)
{
char *curr_loc;
unsigned long chars_copied = 0;
char delimeter;
char wwn_str[kWWNStringLength + 1];
char target_index_str[kTargetIndexStringLength + 1];
- uint64_t wwn;
- tUINT32 target_index;
+ u64 wwn;
+ u32 target_index;
srp_target_t *target;
int status;
long result;
- tUINT32 i;
+ u32 i;
/* first convert to lower case to make life easier */
ConvertToLowerCase(parameters);
@@ -362,7 +362,7 @@
result = StringToHex32(target_index_str, &target_index);
target = &srp_targets[target_index];
- *(tUINT64 *) & (target->service_name) = cpu_to_be64(wwn);
+ *(u64 *) & (target->service_name) = cpu_to_be64(wwn);
printk("to Target %x\n", target_index);
status = srp_host_alloc_pkts(target);
if (status) {
Index: drivers/infiniband/ulp/srp/srp_cmd.h
===================================================================
--- drivers/infiniband/ulp/srp/srp_cmd.h (revision 615)
+++ drivers/infiniband/ulp/srp/srp_cmd.h (working copy)
@@ -109,270 +109,270 @@
*/
typedef struct buf_format_s {
- tUINT8 rsvd0;
+ u8 rsvd0;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 rsvd_b0:1, ddbd:1, idbd:1, rsvd_b3:5;
+ u8 rsvd_b0:1, ddbd:1, idbd:1, rsvd_b3:5;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 rsvd_b3:5, idbd:1, ddbd:1, rsvd_b0:1;
+ u8 rsvd_b3:5, idbd:1, ddbd:1, rsvd_b0:1;
#else
#error "Please fix <asm/byteorder.h>"
#endif
} buf_format_t;
typedef struct _srp_iu {
- tUINT8 opcode;
- tUINT8 rsvd[7];
- tUINT64 tag;
+ u8 opcode;
+ u8 rsvd[7];
+ u64 tag;
} srp_iu_t;
/*
* Remote buffer header
*/
typedef struct srp_remote_buf_s {
- uint64_t r_data; /* physical address on the remote node */
- int32_t r_key; /* R_Key */
+ u64 r_data; /* physical address on the remote node */
+ s32 r_key; /* R_Key */
unsigned int r_size; /* size of remote buffer */
} srp_remote_buf_t;
typedef struct _srp_login_req_t {
- tUINT8 opcode;
- tUINT8 rsvd[7];
- tUINT64 tag;
+ u8 opcode;
+ u8 rsvd[7];
+ u64 tag;
int request_I_T_IU;
- tUINT8 rsvd1[4];
+ u8 rsvd1[4];
buf_format_t req_buf_format;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 multi_chan:2, rsvd3:6;
+ u8 multi_chan:2, rsvd3:6;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 rsvd3:6, multi_chan:2;
+ u8 rsvd3:6, multi_chan:2;
#endif
- tUINT8 rsvd4;
- tUINT8 rsvd5[4];
- tUINT8 initiator_port_id[16];
- tUINT8 target_port_id[16];
+ u8 rsvd4;
+ u8 rsvd5[4];
+ u8 initiator_port_id[16];
+ u8 target_port_id[16];
} srp_login_req_t;
typedef struct _srp_login_resp_t {
- tUINT8 opcode;
- tUINT8 rsvd[3];
- tUINT32 request_limit_delta;
- tUINT64 tag;
- tUINT32 request_I_T_IU;
- tUINT32 request_T_I_IU;
+ u8 opcode;
+ u8 rsvd[3];
+ u32 request_limit_delta;
+ u64 tag;
+ u32 request_I_T_IU;
+ u32 request_T_I_IU;
buf_format_t sup_buf_format;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 multi_chan:2, rsvd3:6;
+ u8 multi_chan:2, rsvd3:6;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 rsvd3:6, multi_chan:2;
+ u8 rsvd3:6, multi_chan:2;
#endif
- tUINT8 rsvd4[25];
+ u8 rsvd4[25];
} srp_login_resp_t;
typedef struct _srp_login_rej {
- tUINT8 opcode;
- tUINT8 rsvd[3];
- tUINT32 reason_code;
- tUINT64 tag;
- tUINT8 rsvd1[8];
+ u8 opcode;
+ u8 rsvd[3];
+ u32 reason_code;
+ u64 tag;
+ u8 rsvd1[8];
buf_format_t sup_buf_format;
- tUINT8 rsvd2[6];
+ u8 rsvd2[6];
} srp_login_rej_t;
struct srp_I_logout {
- tUINT8 opcode;
- tUINT8 rsvd[7];
- tUINT64 tag;
+ u8 opcode;
+ u8 rsvd[7];
+ u64 tag;
};
typedef struct _srp_t_logout_t {
- tUINT8 opcode;
- tUINT8 rsvd[3];
- tUINT32 reason_code;
- tUINT64 tag;
+ u8 opcode;
+ u8 rsvd[3];
+ u32 reason_code;
+ u64 tag;
} srp_t_logout_t;
typedef struct _srp_tm_t {
- tUINT8 opcode;
- tUINT8 rsvd[7];
- tUINT64 tag;
- tUINT32 rsvd1;
- tUINT8 lun[8];
- tUINT8 rsvd2[2];
- tUINT8 task_mgt_flags;
- tUINT8 rsvd3;
- tUINT64 cmd_tag;
- tUINT8 rsvd4[8];
+ u8 opcode;
+ u8 rsvd[7];
+ u64 tag;
+ u32 rsvd1;
+ u8 lun[8];
+ u8 rsvd2[2];
+ u8 task_mgt_flags;
+ u8 rsvd3;
+ u64 cmd_tag;
+ u8 rsvd4[8];
} srp_tm_t;
#define CMD_TAG_OFFSET 1
#define CMD_LUN_OFFSET 4
typedef struct _srp_cmd_t {
- tUINT8 opcode;
- tUINT8 rsvd1[4];
+ u8 opcode;
+ u8 rsvd1[4];
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 difmt:4, dofmt:4;
+ u8 difmt:4, dofmt:4;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 dofmt:4, difmt:4;
+ u8 dofmt:4, difmt:4;
#else
#error "Please fix <asm/byteorder.h>"
#endif
- tUINT8 docount;
- tUINT8 dicount;
- tUINT64 tag;
- tUINT8 rsvd3[4];
- tUINT8 lun[8];
- tUINT8 rsvd4;
+ u8 docount;
+ u8 dicount;
+ u64 tag;
+ u8 rsvd3[4];
+ u8 lun[8];
+ u8 rsvd4;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 task_attr:3, rsvd5:5;
+ u8 task_attr:3, rsvd5:5;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 rsvd5:5, task_attr:3;
+ u8 rsvd5:5, task_attr:3;
#endif
- tUINT8 rsvd6;
+ u8 rsvd6;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 rsvd7:2, add_cdb_len:6;
+ u8 rsvd7:2, add_cdb_len:6;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 add_cdb_len:6, rsvd7:2;
+ u8 add_cdb_len:6, rsvd7:2;
#endif
- tUINT8 cdb[16];
+ u8 cdb[16];
} srp_cmd_t;
typedef struct _srp_cmd_indirect_data_buffer_descriptor {
srp_remote_buf_t indirect_table_descriptor;
- tUINT32 total_length; /* of the data transfer */
+ u32 total_length; /* of the data transfer */
srp_remote_buf_t partial_memory_descriptor_list[0];
} srp_cmd_indirect_data_buffer_descriptor_t;
typedef struct _resp_data {
- tUINT8 rsvd[3];
- tUINT8 response_code;
+ u8 rsvd[3];
+ u8 response_code;
} resp_data_t;
typedef struct _srp_resp {
- tUINT8 opcode;
- tUINT8 rsvd1[3];
- tUINT32 request_limit_delta;
- tUINT64 tag;
+ u8 opcode;
+ u8 rsvd1[3];
+ u32 request_limit_delta;
+ u64 tag;
union {
struct {
- tUINT8 rsvd[2];
+ u8 rsvd[2];
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 rspvalid:1,
+ u8 rspvalid:1,
snsvalid:1,
doover:1, dounder:1, diover:1, diunder:1, rsvd0:2;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 rsvd0:2,
+ u8 rsvd0:2,
diunder:1,
diover:1,
dounder:1, doover:1, snsvalid:1, rspvalid:1;
#else
#error "Please fix <asm/byteorder.h>"
#endif
- tUINT8 status;
+ u8 status;
} bit;
- tUINT32 word;
+ u32 word;
} status;
- tUINT32 data_out_residual_count;
- tUINT32 data_in_residual_count;
- tUINT32 sense_len;
- tUINT32 response_len;
+ u32 data_out_residual_count;
+ u32 data_in_residual_count;
+ u32 sense_len;
+ u32 response_len;
} srp_resp_t;
typedef struct srp_RPL_res_s {
- tUINT32 lun_list_len;
- tUINT32 res;
+ u32 lun_list_len;
+ u32 res;
union {
- tUINT64 l;
- tUINT8 b[8];
+ u64 l;
+ u8 b[8];
} u[MAX_SRP_LUN];
} report_lun_res_t;
typedef struct _INQUIRYDATA {
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 DeviceType:5;
- tUINT8 DeviceTypeQualifier:3;
+ u8 DeviceType:5;
+ u8 DeviceTypeQualifier:3;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 DeviceTypeQualifier:3;
- tUINT8 DeviceType:5;
+ u8 DeviceTypeQualifier:3;
+ u8 DeviceType:5;
#endif
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 DeviceTypeModifier:7;
- tUINT8 RemovableMedia:1;
+ u8 DeviceTypeModifier:7;
+ u8 RemovableMedia:1;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 RemovableMedia:1;
- tUINT8 DeviceTypeModifier:7;
+ u8 RemovableMedia:1;
+ u8 DeviceTypeModifier:7;
#endif
- tUINT8 Versions;
+ u8 Versions;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 ResponseDataFormat:4;
- tUINT8 HiSup:1;
- tUINT8 NormACA:1;
- tUINT8 Obsolete:1;
- tUINT8 AERC:1;
+ u8 ResponseDataFormat:4;
+ u8 HiSup:1;
+ u8 NormACA:1;
+ u8 Obsolete:1;
+ u8 AERC:1;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 AERC:1;
- tUINT8 Obsolete:1;
- tUINT8 NormACA:1;
- tUINT8 HiSup:1;
- tUINT8 ResponseDataFormat:4;
+ u8 AERC:1;
+ u8 Obsolete:1;
+ u8 NormACA:1;
+ u8 HiSup:1;
+ u8 ResponseDataFormat:4;
#endif
- tUINT8 AdditionalLength;
- tUINT8 Reserved;
+ u8 AdditionalLength;
+ u8 Reserved;
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 BQue:1;
- tUINT8 EncServ:1;
- tUINT8 VS:1;
- tUINT8 MultiP:1;
- tUINT8 MChngr:1;
- tUINT8 obso2:1;
- tUINT8 Obso:1;
- tUINT8 ADDR16:1;
+ u8 BQue:1;
+ u8 EncServ:1;
+ u8 VS:1;
+ u8 MultiP:1;
+ u8 MChngr:1;
+ u8 obso2:1;
+ u8 Obso:1;
+ u8 ADDR16:1;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 ADDR16:1;
- tUINT8 Obso:1;
- tUINT8 obso2:1;
- tUINT8 MChngr:1;
- tUINT8 MultiP:1;
- tUINT8 VS:1;
- tUINT8 EncServ:1;
- tUINT8 BQue:1;
+ u8 ADDR16:1;
+ u8 Obso:1;
+ u8 obso2:1;
+ u8 MChngr:1;
+ u8 MultiP:1;
+ u8 VS:1;
+ u8 EncServ:1;
+ u8 BQue:1;
#endif
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 SoftReset:1;
- tUINT8 CommandQueue:1;
- tUINT8 Reserved2:1;
- tUINT8 LinkedCommands:1;
- tUINT8 Synchronous:1;
- tUINT8 Wide16Bit:1;
- tUINT8 Wide32Bit:1;
- tUINT8 RelativeAddressing:1;
+ u8 SoftReset:1;
+ u8 CommandQueue:1;
+ u8 Reserved2:1;
+ u8 LinkedCommands:1;
+ u8 Synchronous:1;
+ u8 Wide16Bit:1;
+ u8 Wide32Bit:1;
+ u8 RelativeAddressing:1;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 RelativeAddressing:1;
- tUINT8 Wide32Bit:1;
- tUINT8 Wide16Bit:1;
- tUINT8 Synchronous:1;
- tUINT8 LinkedCommands:1;
- tUINT8 Reserved2:1;
- tUINT8 CommandQueue:1;
- tUINT8 SoftReset:1;
+ u8 RelativeAddressing:1;
+ u8 Wide32Bit:1;
+ u8 Wide16Bit:1;
+ u8 Synchronous:1;
+ u8 LinkedCommands:1;
+ u8 Reserved2:1;
+ u8 CommandQueue:1;
+ u8 SoftReset:1;
#endif
- tUINT8 VendorId[8];
- tUINT8 ProductId[16];
- tUINT8 ProductRevisionLevel[4];
- tUINT8 VendorSpecific[20];
- tUINT8 Resv[2];
- tUINT8 VersionDesc[2];
- tUINT8 Reserved3[36];
+ u8 VendorId[8];
+ u8 ProductId[16];
+ u8 ProductRevisionLevel[4];
+ u8 VendorSpecific[20];
+ u8 Resv[2];
+ u8 VersionDesc[2];
+ u8 Reserved3[36];
} inq_data_t;
/*
@@ -393,23 +393,23 @@
#define DEVICE_IDENTIFIER_TYPE_LOGICAL_UNIT_GROUP 6
typedef struct _T10_identifier_format {
- tUINT8 VendorId[8];
- tUINT8 VendorSpecificId[0];
+ u8 VendorId[8];
+ u8 VendorSpecificId[0];
} T10_identifier_format_t;
typedef struct _EUI64_identifier_format {
- tUINT8 IeeeVendorID[3];
- tUINT8 VendorSpecificId[5];
+ u8 IeeeVendorID[3];
+ u8 VendorSpecificId[5];
} EUI64_identifier_format_t;
typedef union _device_identifier_format_t {
- tUINT8 VendorSpecificId[0];
+ u8 VendorSpecificId[0];
T10_identifier_format_t T10Id;
EUI64_identifier_format_t EUI64Id;
} device_identifier_format_t;
typedef struct _device_identifier_t {
- tUINT8 IdLength;
+ u8 IdLength;
device_identifier_format_t Id;
} device_identifier_t;
@@ -426,11 +426,11 @@
#define CODE_SET_BINARY_IDENTIFIER 1
#define CODE_SET_ASCII_IDENTIFIER 2
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 CodeSet:4;
- tUINT8 Reserved1:4;
+ u8 CodeSet:4;
+ u8 Reserved1:4;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 Reserved1:4;
- tUINT8 CodeSet:4;
+ u8 Reserved1:4;
+ u8 CodeSet:4;
#endif
/*
@@ -443,16 +443,16 @@
#define DEV_ID_ASSOCIATION_PORT_DEPENDENT 1
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 IdentifierType:4;
- tUINT8 Association:2;
- tUINT8 Reserved2:2;
+ u8 IdentifierType:4;
+ u8 Association:2;
+ u8 Reserved2:2;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 Reserved2:2;
- tUINT8 Association:2;
- tUINT8 IdentifierType:4;
+ u8 Reserved2:2;
+ u8 Association:2;
+ u8 IdentifierType:4;
#endif
- tUINT8 Reserved3;
+ u8 Reserved3;
device_identifier_t identifier;
} device_identification_descriptor_t;
@@ -463,15 +463,15 @@
typedef struct _INQUIRYEVPD {
#if defined(__LITTLE_ENDIAN_BITFIELD)
- tUINT8 DeviceType:5;
- tUINT8 DeviceTypeQualifier:3;
+ u8 DeviceType:5;
+ u8 DeviceTypeQualifier:3;
#elif defined (__BIG_ENDIAN_BITFIELD)
- tUINT8 DeviceTypeQualifier:3;
- tUINT8 DeviceType:5;
+ u8 DeviceTypeQualifier:3;
+ u8 DeviceType:5;
#endif
- tUINT8 Page_code;
- tUINT8 Resv;
- tUINT8 Page_len;
+ u8 Page_code;
+ u8 Resv;
+ u8 Page_len;
device_identification_descriptor_t descriptors[0];
} inq_evpddata_t;
@@ -492,32 +492,32 @@
#define FCP_LUN_LEN 8
typedef struct fcp_cntl_s {
- tUINT8 reserved;
- tUINT8 task_codes;
- tUINT8 task_mgmt_flags;
- tUINT8 exec_mgmt_code;
+ u8 reserved;
+ u8 task_codes;
+ u8 task_mgmt_flags;
+ u8 exec_mgmt_code;
} fcp_cntl_t;
/*
* FCP_CMND IU
*/
typedef struct fcp_cmnd_s {
- tUINT8 lun[8];
+ u8 lun[8];
fcp_cntl_t cntl;
- tUINT8 cdb[FCP_CDB_LEN];
- tUINT32 data_len;
+ u8 cdb[FCP_CDB_LEN];
+ u32 data_len;
} fcp_cmnd_t;
/*
* FCP_RSP IU
*/
typedef struct fcp_rsp_s {
- tUINT8 reserved[8];
- tUINT8 status[4];
- tUINT32 residual;
- tUINT32 sns_len;
- tUINT32 rsp_len;
- tUINT8 rsp_sns[FCP_RSP_SNS_BUF_SIZE];
+ u8 reserved[8];
+ u8 status[4];
+ u32 residual;
+ u32 sns_len;
+ u32 rsp_len;
+ u8 rsp_sns[FCP_RSP_SNS_BUF_SIZE];
} fcp_rsp_t;
#pragma pack()
Index: drivers/infiniband/ulp/sdp/sdp_queue.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_queue.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_queue.h (working copy)
@@ -55,8 +55,8 @@
*/
struct sdpc_desc_q {
struct sdpc_desc *head; /* double linked list of advertisments */
- tINT32 size; /* current number of advertisments in table */
- tUINT16 count[TS_SDP_GENERIC_TYPE_NONE]; /* object specific counter */
+ s32 size; /* current number of advertisments in table */
+ u16 count[TS_SDP_GENERIC_TYPE_NONE]; /* object specific counter */
}; /* struct sdpc_desc_q */
/*
* object destruction callback type
Index: drivers/infiniband/ulp/sdp/sdp_write.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_write.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_write.c (working copy)
@@ -37,12 +37,12 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_event_write -- RDMA write event handler. */
-tINT32 sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp)
+s32 sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp)
{
struct sdpc_iocb *iocb;
struct sdpc_buff *buff;
- tINT32 result;
- tINT32 type;
+ s32 result;
+ s32 type;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(comp, -EINVAL);
Index: drivers/infiniband/ulp/sdp/sdp_rcvd.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_rcvd.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_rcvd.c (working copy)
@@ -649,7 +649,7 @@
static int _sdp_rcvd_snk_cancel(struct sdp_opt *conn, struct sdpc_buff *buff)
{
struct sdpc_advt *advt;
- tINT32 counter;
+ s32 counter;
int result;
TS_CHECK_NULL(conn, -EINVAL);
@@ -1037,7 +1037,7 @@
struct msg_hdr_srcah *srcah;
struct sdpc_advt *advt;
int result;
- tINT32 size;
+ s32 size;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1364,7 +1364,7 @@
/* ========================================================================= */
/*..sdp_event_recv -- recv event demultiplexing into sdp messages. */
-tINT32 sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp)
+s32 sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp)
{
tGW_SDP_EVENT_CB_FUNC dispatch_func;
struct sdpc_buff *buff;
@@ -1452,8 +1452,8 @@
* the number we've sent and the remote host has received.
*/
conn->r_recv_bf = (buff->bsdh_hdr->recv_bufs -
- abs((tINT32) conn->send_seq -
- (tINT32) buff->bsdh_hdr->seq_ack));
+ abs((s32) conn->send_seq -
+ (s32) buff->bsdh_hdr->seq_ack));
/*
* dispatch
*/
Index: drivers/infiniband/ulp/sdp/sdp_proto.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_proto.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_proto.h (working copy)
@@ -92,7 +92,7 @@
tSDP_BUFF_TEST_FUNC test_func,
void *usr_arg);
-int sdp_buff_pool_init(tUINT32 buff_min, tUINT32 buff_max);
+int sdp_buff_pool_init(u32 buff_min, u32 buff_max);
void sdp_buff_pool_destroy(void);
@@ -141,15 +141,15 @@
int sdp_wall_abort(struct sdp_opt *conn);
-tINT32 sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff);
+s32 sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff);
/* --------------------------------------------------------------------- */
/* Zcopy advertisment managment */
/* --------------------------------------------------------------------- */
-tINT32 sdp_main_advt_init(void);
+s32 sdp_main_advt_init(void);
-tINT32 sdp_main_advt_cleanup(void);
+s32 sdp_main_advt_cleanup(void);
-struct sdpc_advt_q *sdp_advt_q_create(tINT32 * result);
+struct sdpc_advt_q *sdp_advt_q_create(s32 * result);
int sdp_advt_q_init(struct sdpc_advt_q *table);
@@ -169,11 +169,11 @@
/* --------------------------------------------------------------------- */
/* Zcopy IOCB managment */
/* --------------------------------------------------------------------- */
-tINT32 sdp_main_iocb_init(void);
+s32 sdp_main_iocb_init(void);
-tINT32 sdp_main_iocb_cleanup(void);
+s32 sdp_main_iocb_cleanup(void);
-struct sdpc_iocb_q *sdp_iocb_q_create(tINT32 * result);
+struct sdpc_iocb_q *sdp_iocb_q_create(s32 * result);
int sdp_iocb_q_init(struct sdpc_iocb_q *table);
@@ -195,9 +195,9 @@
int sdp_iocb_q_put_tail(struct sdpc_iocb_q *table, struct sdpc_iocb *iocb);
-struct sdpc_iocb *sdp_iocb_q_get_key(struct sdpc_iocb_q *table, tUINT32 key);
+struct sdpc_iocb *sdp_iocb_q_get_key(struct sdpc_iocb_q *table, u32 key);
-struct sdpc_iocb *sdp_iocb_q_lookup(struct sdpc_iocb_q *table, tUINT32 key);
+struct sdpc_iocb *sdp_iocb_q_lookup(struct sdpc_iocb_q *table, u32 key);
int sdp_iocb_q_cancel(struct sdpc_iocb_q *table, u32 mask, ssize_t comp);
@@ -248,7 +248,7 @@
int sdp_desc_q_size(struct sdpc_desc_q *table);
-struct sdpc_desc_q *sdp_desc_q_create(tINT32 * result);
+struct sdpc_desc_q *sdp_desc_q_create(s32 * result);
int sdp_desc_q_init(struct sdpc_desc_q *table);
@@ -256,15 +256,15 @@
int sdp_desc_q_destroy(struct sdpc_desc_q *table);
-tINT32 sdp_main_desc_init(void);
+s32 sdp_main_desc_init(void);
-tINT32 sdp_main_desc_cleanup(void);
+s32 sdp_main_desc_cleanup(void);
/* --------------------------------------------------------------------- */
/* proc entry managment */
/* --------------------------------------------------------------------- */
-tINT32 sdp_main_proc_init(void);
+s32 sdp_main_proc_init(void);
-tINT32 sdp_main_proc_cleanup(void);
+s32 sdp_main_proc_cleanup(void);
/* --------------------------------------------------------------------- */
/* connection table */
/* --------------------------------------------------------------------- */
@@ -278,7 +278,7 @@
int send_buff_max,
int send_usig_max);
-tINT32 sdp_conn_table_clear(void);
+s32 sdp_conn_table_clear(void);
int sdp_proc_dump_conn_main(char *buffer,
int max_size,
@@ -305,17 +305,17 @@
off_t start_index,
long *end_index);
-tINT32 sdp_conn_table_remove(struct sdp_opt *conn);
+s32 sdp_conn_table_remove(struct sdp_opt *conn);
-struct sdp_opt *sdp_conn_table_lookup(tINT32 entry);
+struct sdp_opt *sdp_conn_table_lookup(s32 entry);
-struct sdp_opt *sdp_conn_alloc(tINT32 priority, tTS_IB_CM_COMM_ID comm_id);
+struct sdp_opt *sdp_conn_alloc(s32 priority, tTS_IB_CM_COMM_ID comm_id);
int sdp_conn_alloc_ib(struct sdp_opt *conn,
struct ib_device *device,
tTS_IB_PORT hw_port);
-tINT32 sdp_conn_destruct(struct sdp_opt *conn);
+s32 sdp_conn_destruct(struct sdp_opt *conn);
void sdp_inet_wake_send(struct sock *sk);
@@ -329,23 +329,23 @@
/* --------------------------------------------------------------------- */
/* port/queue managment */
/* --------------------------------------------------------------------- */
-tINT32 sdp_inet_accept_q_put(struct sdp_opt *listen_conn, struct sdp_opt *accept_conn);
+s32 sdp_inet_accept_q_put(struct sdp_opt *listen_conn, struct sdp_opt *accept_conn);
struct sdp_opt *sdp_inet_accept_q_get(struct sdp_opt *listen_conn);
-tINT32 sdp_inet_accept_q_remove(struct sdp_opt *accept_conn);
+s32 sdp_inet_accept_q_remove(struct sdp_opt *accept_conn);
-tINT32 sdp_inet_listen_start(struct sdp_opt *listen_conn);
+s32 sdp_inet_listen_start(struct sdp_opt *listen_conn);
-tINT32 sdp_inet_listen_stop(struct sdp_opt *listen_conn);
+s32 sdp_inet_listen_stop(struct sdp_opt *listen_conn);
-struct sdp_opt *sdp_inet_listen_lookup(tUINT32 addr, tUINT16 port);
+struct sdp_opt *sdp_inet_listen_lookup(u32 addr, u16 port);
-tINT32 sdp_inet_port_get(struct sdp_opt *conn, tUINT16 port);
+s32 sdp_inet_port_get(struct sdp_opt *conn, u16 port);
-tINT32 sdp_inet_port_put(struct sdp_opt *conn);
+s32 sdp_inet_port_put(struct sdp_opt *conn);
-tINT32 sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child);
+s32 sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child);
/* --------------------------------------------------------------------- */
/* post functions */
@@ -366,36 +366,36 @@
int sdp_cm_confirm(struct sdp_opt *conn);
-tINT32 sdp_recv_flush(struct sdp_opt *conn);
+s32 sdp_recv_flush(struct sdp_opt *conn);
-tINT32 sdp_send_flush(struct sdp_opt *conn);
+s32 sdp_send_flush(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_ack(struct sdp_opt *conn);
+s32 sdp_send_ctrl_ack(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_disconnect(struct sdp_opt *conn);
+s32 sdp_send_ctrl_disconnect(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_abort(struct sdp_opt *conn);
+s32 sdp_send_ctrl_abort(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_send_sm(struct sdp_opt *conn);
+s32 sdp_send_ctrl_send_sm(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_snk_avail(struct sdp_opt *conn,
- tUINT32 size,
- tUINT32 rkey,
- tUINT64 addr);
+s32 sdp_send_ctrl_snk_avail(struct sdp_opt *conn,
+ u32 size,
+ u32 rkey,
+ u64 addr);
-tINT32 sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, tUINT32 size);
+s32 sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, u32 size);
-tINT32 sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, tINT32 size);
+s32 sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, s32 size);
-tINT32 sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, tUINT32 size);
+s32 sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, u32 size);
-tINT32 sdp_send_ctrl_mode_ch(struct sdp_opt *conn, tUINT8 mode);
+s32 sdp_send_ctrl_mode_ch(struct sdp_opt *conn, u8 mode);
-tINT32 sdp_send_ctrl_src_cancel(struct sdp_opt *conn);
+s32 sdp_send_ctrl_src_cancel(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_snk_cancel(struct sdp_opt *conn);
+s32 sdp_send_ctrl_snk_cancel(struct sdp_opt *conn);
-tINT32 sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn);
+s32 sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn);
/* --------------------------------------------------------------------- */
/* inet functions */
@@ -403,7 +403,7 @@
/* --------------------------------------------------------------------- */
/* event functions */
/* --------------------------------------------------------------------- */
-tINT32 sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn);
+s32 sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn);
void sdp_cq_event_handler(struct ib_cq *cq, void *arg);
@@ -411,13 +411,13 @@
tTS_IB_CM_COMM_ID comm_id,
void *params, void *arg);
-tINT32 sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp);
+s32 sdp_event_recv(struct sdp_opt *conn, struct ib_wc *comp);
-tINT32 sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp);
+s32 sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp);
-tINT32 sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp);
+s32 sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp);
-tINT32 sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp);
+s32 sdp_event_write(struct sdp_opt *conn, struct ib_wc *comp);
/* --------------------------------------------------------------------- */
/* internal connection lock functions */
@@ -428,7 +428,7 @@
void sdp_conn_internal_relock(struct sdp_opt *conn);
-tINT32 sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn);
+s32 sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn);
/* --------------------------------------------------------------------- */
/* DATA transport */
@@ -469,9 +469,9 @@
/* --------------------------------------------------------------------- */
/* ====================================================================== */
/*..__sdp_inet_write_space -- writable space on send side. */
-static __inline__ tINT32 __sdp_inet_write_space(struct sdp_opt *conn, tINT32 urg)
+static __inline__ s32 __sdp_inet_write_space(struct sdp_opt *conn, s32 urg)
{
- tINT32 size;
+ s32 size;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -497,7 +497,7 @@
/* ====================================================================== */
/*..__sdp_inet_writable -- return non-zero if socket is writable. */
-static __inline__ tINT32 __sdp_inet_writable(struct sdp_opt *conn)
+static __inline__ s32 __sdp_inet_writable(struct sdp_opt *conn)
{
TS_CHECK_NULL(conn, -EINVAL);
@@ -514,10 +514,10 @@
/* ======================================================================== */
/*..__sdp_conn_stat_dump -- dump stats to the log */
-static __inline__ tINT32 __sdp_conn_stat_dump(struct sdp_opt *conn)
+static __inline__ s32 __sdp_conn_stat_dump(struct sdp_opt *conn)
{
#ifdef _TS_SDP_CONN_STATS_REC
- tUINT32 counter;
+ u32 counter;
TS_TRACE(MOD_LNX_SDP, T_VERBOSE, TRACE_FLOW_INOUT,
"STAT: src <%u> snk <%u>", conn->src_serv, conn->snk_serv);
@@ -540,10 +540,10 @@
/* ======================================================================== */
/*..__sdp_conn_state_dump -- dump state information to the log */
-static __inline__ tINT32 __sdp_conn_state_dump(struct sdp_opt *conn)
+static __inline__ s32 __sdp_conn_state_dump(struct sdp_opt *conn)
{
#ifdef _TS_SDP_CONN_STATE_REC
- tUINT32 counter;
+ u32 counter;
TS_CHECK_NULL(conn, -EINVAL);
@@ -593,14 +593,14 @@
/* ======================================================================== */
/*..__sdp_conn_error -- get the connections error value destructively. */
-static inline tINT32 __sdp_conn_error(struct sdp_opt *conn)
+static inline s32 __sdp_conn_error(struct sdp_opt *conn)
{
/*
* The connection error parameter is set and read under the connection
* lock, however the linux socket error, needs to be xchg'd since the
* SO_ERROR getsockopt happens outside of the connection lock.
*/
- tINT32 error = xchg(&TS_SDP_OS_SK_ERR(conn->sk), 0);
+ s32 error = xchg(&TS_SDP_OS_SK_ERR(conn->sk), 0);
TS_SDP_OS_CONN_SET_ERR(conn, 0);
return -error;
Index: drivers/infiniband/ulp/sdp/sdp_read.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_read.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_read.c (working copy)
@@ -38,11 +38,11 @@
/* ========================================================================= */
/*.._sdp_event_read_advt -- RDMA read event handler for source advertisments. */
-static tINT32
+static s32
_sdp_event_read_advt(struct sdp_opt *conn, struct ib_wc *comp)
{
struct sdpc_advt *advt;
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(comp, -EINVAL);
@@ -114,12 +114,12 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_event_read -- RDMA read event handler. */
-tINT32 sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp)
+s32 sdp_event_read(struct sdp_opt *conn, struct ib_wc *comp)
{
struct sdpc_iocb *iocb;
struct sdpc_buff *buff;
- tINT32 result;
- tINT32 type;
+ s32 result;
+ s32 type;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(comp, -EINVAL);
Index: drivers/infiniband/ulp/sdp/sdp_send.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_send.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_send.c (working copy)
@@ -41,10 +41,10 @@
/* ========================================================================= */
/*.._sdp_inet_write_cancel_func -- lookup function for cancelation */
-static tINT32 _sdp_inet_write_cancel_func(struct sdpc_desc *element, void *arg)
+static s32 _sdp_inet_write_cancel_func(struct sdpc_desc *element, void *arg)
{
struct sdpc_iocb *iocb = (struct sdpc_iocb *) element;
- tINT32 value = (tINT32) (unsigned long)arg;
+ s32 value = (s32) (unsigned long)arg;
TS_CHECK_NULL(element, -EINVAL);
@@ -60,13 +60,13 @@
/* ========================================================================= */
/*.._sdp_inet_write_cancel -- cancel an IO operation */
-static tINT32 _sdp_inet_write_cancel(struct kiocb *kiocb
- _TS_AIO_UNUSED_CANCEL_PARAM)
+static s32
+_sdp_inet_write_cancel(struct kiocb *kiocb _TS_AIO_UNUSED_CANCEL_PARAM)
{
struct sock *sk;
struct sdp_opt *conn;
struct sdpc_iocb *iocb;
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(kiocb, -ERANGE);
@@ -241,10 +241,10 @@
/* ========================================================================= */
/*.._sdp_send_buff_post -- Post a buffer send on a SDP connection. */
-static tINT32 _sdp_send_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32 _sdp_send_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
{
struct ib_send_param send_param = { 0 };
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -402,10 +402,11 @@
/* ========================================================================= */
/*.._sdp_send_data_buff_post -- Post data for buffered transmission */
-static tINT32 _sdp_send_data_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32
+_sdp_send_data_buff_post(struct sdp_opt *conn, struct sdpc_buff *buff)
{
struct sdpc_advt *advt;
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -526,12 +527,12 @@
/* ========================================================================= */
/*.._sdp_send_data_buff_snk -- Post data for buffered transmission */
-static tINT32 _sdp_send_data_buff_snk(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32 _sdp_send_data_buff_snk(struct sdp_opt *conn, struct sdpc_buff *buff)
{
struct ib_send_param send_param = { 0 };
struct sdpc_advt *advt;
- tINT32 result;
- tINT32 zcopy;
+ s32 result;
+ s32 zcopy;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -678,13 +679,13 @@
/* ========================================================================= */
/*.._sdp_send_data_iocb_snk -- process a zcopy write advert in the data path */
-tINT32 _sdp_send_data_iocb_snk(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+s32 _sdp_send_data_iocb_snk(struct sdp_opt *conn, struct sdpc_iocb *iocb)
{
struct ib_send_param send_param = { 0 };
struct ib_gather_scatter sg_val;
struct sdpc_advt *advt;
- tINT32 result;
- tINT32 zcopy;
+ s32 result;
+ s32 zcopy;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(iocb, -EINVAL);
@@ -818,11 +819,11 @@
/* ========================================================================= */
/*.._sdp_send_data_iocb_src -- send a zcopy read advertisment in the data path */
-tINT32 _sdp_send_data_iocb_src(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+s32 _sdp_send_data_iocb_src(struct sdp_opt *conn, struct sdpc_iocb *iocb)
{
struct msg_hdr_srcah *src_ah;
struct sdpc_buff *buff;
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(iocb, -EINVAL);
@@ -932,7 +933,7 @@
if (TS_SDP_MODE_COMB == conn->send_mode) {
#ifdef _TS_SDP_AIO_SUPPORT
void *vaddr;
- tINT32 offset;
+ s32 offset;
/*
* In combined mode, it's a protocol requirment to send at
* least a byte of data in the SrcAvail.
@@ -1005,14 +1006,14 @@
#ifdef _TS_SDP_AIO_SUPPORT
/* ========================================================================= */
/*.._sdp_send_data_iocb_buff_kvec -- write into a SDP buffer from a kvec */
-static tINT32 _sdp_send_data_iocb_buff_kvec(struct kvec_dst *src,
+static s32 _sdp_send_data_iocb_buff_kvec(struct kvec_dst *src,
struct sdpc_buff *buff,
- tINT32 len)
+ s32 len)
{
void *tail;
- tINT32 part;
- tINT32 left;
- tINT32 copy;
+ s32 part;
+ s32 left;
+ s32 copy;
TS_CHECK_NULL(src, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1023,7 +1024,7 @@
/*
* copy from source to buffer
*/
- copy = min(len, (tINT32) (buff->end - buff->tail));
+ copy = min(len, (s32) (buff->end - buff->tail));
tail = buff->tail;
for (left = copy; 0 < left;) {
@@ -1071,13 +1072,14 @@
/* ========================================================================= */
/*.._sdp_send_data_iocb_buff -- write multiple SDP buffers from an ioc */
-static tINT32 _sdp_send_data_iocb_buff(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static s32
+_sdp_send_data_iocb_buff(struct sdp_opt *conn, struct sdpc_iocb *iocb)
{
struct sdpc_buff *buff;
- tINT32 copy;
- tINT32 partial = 0;
- tINT32 result;
- tINT32 w_space;
+ s32 copy;
+ s32 partial = 0;
+ s32 result;
+ s32 w_space;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(iocb, -EINVAL);
@@ -1166,9 +1168,9 @@
/* ========================================================================= */
/*.._sdp_send_data_iocb -- Post IOCB data for transmission */
-static tINT32 _sdp_send_data_iocb(struct sdp_opt *conn, struct sdpc_iocb *iocb)
+static s32 _sdp_send_data_iocb(struct sdp_opt *conn, struct sdpc_iocb *iocb)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(iocb, -EINVAL);
@@ -1300,9 +1302,10 @@
/* ========================================================================= */
/*.._sdp_send_data_queue_test -- send data buffer if conditions are met */
-static tINT32 _sdp_send_data_queue_test(struct sdp_opt *conn, struct sdpc_desc *element)
+static s32
+_sdp_send_data_queue_test(struct sdp_opt *conn, struct sdpc_desc *element)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(element, -EINVAL);
@@ -1345,10 +1348,10 @@
/* ========================================================================= */
/*.._sdp_send_data_queue_flush -- Flush data from send queue, to send post. */
-static tINT32 _sdp_send_data_queue_flush(struct sdp_opt *conn)
+static s32 _sdp_send_data_queue_flush(struct sdp_opt *conn)
{
struct sdpc_desc *element;
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -1396,9 +1399,9 @@
/* ========================================================================= */
/*.._sdp_send_data_queue -- send using the data queue if necessary. */
-static tINT32 _sdp_send_data_queue(struct sdp_opt *conn, struct sdpc_desc *element)
+static s32 _sdp_send_data_queue(struct sdp_opt *conn, struct sdpc_desc *element)
{
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(element, -EINVAL);
@@ -1500,13 +1503,13 @@
/* ========================================================================= */
/*.._sdp_send_data_buff_put -- place a buffer into the send queue */
-static __inline__ tINT32 _sdp_send_data_buff_put(struct sdp_opt *conn,
- struct sdpc_buff *buff,
- tINT32 size,
- tINT32 urg)
+static __inline__ s32 _sdp_send_data_buff_put(struct sdp_opt *conn,
+ struct sdpc_buff *buff,
+ s32 size,
+ s32 urg)
{
- tINT32 result = 0;
- tINT32 expect;
+ s32 result = 0;
+ s32 expect;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1567,9 +1570,10 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_send_ctrl_buff_test -- determine if it's OK to post a control msg */
-static tINT32 _sdp_send_ctrl_buff_test(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32
+_sdp_send_ctrl_buff_test(struct sdp_opt *conn, struct sdpc_buff *buff)
{
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1599,10 +1603,10 @@
/* ========================================================================= */
/*.._sdp_send_ctrl_buff_flush -- Flush control buffers, to send post. */
-static tINT32 _sdp_send_ctrl_buff_flush(struct sdp_opt *conn)
+static s32 _sdp_send_ctrl_buff_flush(struct sdp_opt *conn)
{
struct sdpc_desc *element;
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -1643,9 +1647,10 @@
/* ========================================================================= */
/*.._sdp_send_ctrl_buff_buffered -- Send a buffered control message. */
-static tINT32 _sdp_send_ctrl_buff_buffered(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32
+_sdp_send_ctrl_buff_buffered(struct sdp_opt *conn, struct sdpc_buff *buff)
{
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1684,12 +1689,12 @@
/* ========================================================================= */
/*.._sdp_send_ctrl_buff -- Create and Send a buffered control message. */
-static tINT32 _sdp_send_ctrl_buff(struct sdp_opt *conn,
- tUINT8 mid,
+static s32 _sdp_send_ctrl_buff(struct sdp_opt *conn,
+ u8 mid,
tBOOLEAN se,
tBOOLEAN sig)
{
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -1753,9 +1758,9 @@
/* ========================================================================= */
/*.._sdp_send_ctrl_disconnect -- Send a disconnect request. */
-static tINT32 _sdp_send_ctrl_disconnect(struct sdp_opt *conn)
+static s32 _sdp_send_ctrl_disconnect(struct sdp_opt *conn)
{
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -1806,9 +1811,9 @@
/* ========================================================================= */
/*..sdp_send_ctrl_disconnect -- potentially send a disconnect request. */
-tINT32 sdp_send_ctrl_disconnect(struct sdp_opt *conn)
+s32 sdp_send_ctrl_disconnect(struct sdp_opt *conn)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -1840,7 +1845,7 @@
/* ========================================================================= */
/*..sdp_send_ctrl_ack -- Send a gratuitous Ack. */
-tINT32 sdp_send_ctrl_ack(struct sdp_opt *conn)
+s32 sdp_send_ctrl_ack(struct sdp_opt *conn)
{
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -1864,28 +1869,28 @@
/* ========================================================================= */
/*..sdp_send_ctrl_send_sm -- Send a request for buffered mode. */
-tINT32 sdp_send_ctrl_send_sm(struct sdp_opt *conn)
+s32 sdp_send_ctrl_send_sm(struct sdp_opt *conn)
{
return _sdp_send_ctrl_buff(conn, TS_SDP_MSG_MID_SEND_SM, TRUE, TRUE);
} /* sdp_send_ctrl_send_sm */
/* ========================================================================= */
/*..sdp_send_ctrl_src_cancel -- Send a source cancel */
-tINT32 sdp_send_ctrl_src_cancel(struct sdp_opt *conn)
+s32 sdp_send_ctrl_src_cancel(struct sdp_opt *conn)
{
return _sdp_send_ctrl_buff(conn, TS_SDP_MSG_MID_SRC_CANCEL, TRUE, TRUE);
} /* sdp_send_ctrl_src_cancel */
/* ========================================================================= */
/*..sdp_send_ctrl_snk_cancel -- Send a sink cancel */
-tINT32 sdp_send_ctrl_snk_cancel(struct sdp_opt *conn)
+s32 sdp_send_ctrl_snk_cancel(struct sdp_opt *conn)
{
return _sdp_send_ctrl_buff(conn, TS_SDP_MSG_MID_SNK_CANCEL, TRUE, TRUE);
} /* sdp_send_ctrl_snk_cancel */
/* ========================================================================= */
/*..sdp_send_ctrl_snk_cancel_ack -- Send an ack for a sink cancel */
-tINT32 sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn)
+s32 sdp_send_ctrl_snk_cancel_ack(struct sdp_opt *conn)
{
return _sdp_send_ctrl_buff(conn, TS_SDP_MSG_MID_SNK_CANCEL_ACK, TRUE,
TRUE);
@@ -1893,7 +1898,7 @@
/* ========================================================================= */
/*..sdp_send_ctrl_abort -- Send an abort message. */
-tINT32 sdp_send_ctrl_abort(struct sdp_opt *conn)
+s32 sdp_send_ctrl_abort(struct sdp_opt *conn)
{
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -1904,10 +1909,10 @@
/* ========================================================================= */
/*..sdp_send_ctrl_resize_buff_ack -- Send an ack for a buffer size change */
-tINT32 sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, tUINT32 size)
+s32 sdp_send_ctrl_resize_buff_ack(struct sdp_opt *conn, u32 size)
{
struct msg_hdr_crbah *crbah;
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -1960,10 +1965,10 @@
/* ========================================================================= */
/*..sdp_send_ctrl_rdma_rd -- Send an rdma read completion */
-tINT32 sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, tINT32 size)
+s32 sdp_send_ctrl_rdma_rd(struct sdp_opt *conn, s32 size)
{
struct msg_hdr_rrch *rrch;
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -1998,7 +2003,7 @@
buff->bsdh_hdr->flags = TS_SDP_MSG_FLAG_NON_FLAG;
buff->tail += sizeof(struct msg_hdr_bsdh);
rrch = (struct msg_hdr_rrch *) buff->tail;
- rrch->size = (tUINT32) size;
+ rrch->size = (u32) size;
buff->tail += sizeof(struct msg_hdr_rrch);
/*
* solicit event
@@ -2036,10 +2041,10 @@
/* ========================================================================= */
/*..sdp_send_ctrl_rdma_wr -- Send an rdma write completion */
-tINT32 sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, tUINT32 size)
+s32 sdp_send_ctrl_rdma_wr(struct sdp_opt *conn, u32 size)
{
struct msg_hdr_rwch *rwch;
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -2098,13 +2103,13 @@
/* ========================================================================= */
/*..sdp_send_ctrl_snk_avail -- Send a sink available message */
-tINT32 sdp_send_ctrl_snk_avail(struct sdp_opt *conn,
- tUINT32 size,
- tUINT32 rkey,
- tUINT64 addr)
+s32 sdp_send_ctrl_snk_avail(struct sdp_opt *conn,
+ u32 size,
+ u32 rkey,
+ u64 addr)
{
struct msg_hdr_snkah *snkah;
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -2170,10 +2175,10 @@
/* ========================================================================= */
/*..sdp_send_ctrl_mode_ch -- Send a mode change command */
-tINT32 sdp_send_ctrl_mode_ch(struct sdp_opt *conn, tUINT8 mode)
+s32 sdp_send_ctrl_mode_ch(struct sdp_opt *conn, u8 mode)
{
struct msg_hdr_mch *mch;
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -2268,10 +2273,10 @@
/* ========================================================================= */
/*.._sdp_send_flush_advt -- Flush passive sink advertisments */
-static tINT32 _sdp_send_flush_advt(struct sdp_opt *conn)
+static s32 _sdp_send_flush_advt(struct sdp_opt *conn)
{
struct sdpc_advt *advt;
- tINT32 result;
+ s32 result;
/*
* If there is no data in the pending or active send pipes, and a
* partially complete sink advertisment is pending, then it needs
@@ -2312,9 +2317,9 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_send_flush -- Flush buffers from send queue, in to send post. */
-tINT32 sdp_send_flush(struct sdp_opt *conn)
+s32 sdp_send_flush(struct sdp_opt *conn)
{
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -2389,10 +2394,10 @@
struct sock *sk;
struct sdp_opt *conn;
struct sdpc_buff *buff;
- tINT32 result = 0;
- tINT32 copied = 0;
- tINT32 copy;
- tINT32 oob;
+ s32 result = 0;
+ s32 copied = 0;
+ s32 copy;
+ s32 oob;
long timeout = -1;
TS_CHECK_NULL(sock, -EINVAL);
@@ -2565,15 +2570,15 @@
#ifdef _TS_SDP_AIO_SUPPORT
/* ========================================================================= */
/*.._sdp_inet_write_fast -- write multiple SDP buffers from an iocb */
-static tINT32 _sdp_inet_write_fast(struct sdp_opt *conn,
- struct kvec_dst *src,
- tINT32 len)
+static s32 _sdp_inet_write_fast(struct sdp_opt *conn,
+ struct kvec_dst *src,
+ s32 len)
{
struct sdpc_buff *buff;
- tINT32 copied = 0;
- tINT32 expect;
- tINT32 result;
- tINT32 copy;
+ s32 copied = 0;
+ s32 expect;
+ s32 result;
+ s32 copy;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(src, -EINVAL);
@@ -2631,8 +2636,8 @@
struct sock *sk;
struct sdp_opt *conn;
struct sdpc_iocb *iocb;
- tINT32 copied = 0;
- tINT32 result = 0;
+ s32 copied = 0;
+ s32 result = 0;
TS_CHECK_NULL(sock, -EINVAL);
TS_CHECK_NULL(sock->sk, -EINVAL);
@@ -2654,7 +2659,7 @@
"<%d:%d:%08x>",
cb.vec->max_nr, cb.vec->nr,
cb.vec->veclet->offset, cb.vec->veclet->length,
- (tUINT32) cb.fn, req->key, req->users, (tUINT32) req->data);
+ (u32) cb.fn, req->key, req->users, (u32) req->data);
#endif
/*
* initialize memory destination
Index: drivers/infiniband/ulp/sdp/sdp_conn.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_conn.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_conn.c (working copy)
@@ -35,7 +35,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_inet_accept_q_put -- put a conn into a listen conn's accept Q. */
-tINT32 sdp_inet_accept_q_put(struct sdp_opt *listen_conn, struct sdp_opt *accept_conn)
+s32 sdp_inet_accept_q_put(struct sdp_opt *listen_conn, struct sdp_opt *accept_conn)
{
struct sdp_opt *next_conn;
@@ -111,7 +111,7 @@
/* ========================================================================= */
/*..sdp_inet_accept_q_remove -- remove a conn from a conn's accept Q. */
-tINT32 sdp_inet_accept_q_remove(struct sdp_opt *accept_conn)
+s32 sdp_inet_accept_q_remove(struct sdp_opt *accept_conn)
{
struct sdp_opt *next_conn;
struct sdp_opt *prev_conn;
@@ -149,7 +149,7 @@
/* ========================================================================= */
/*..sdp_inet_listen_start -- start listening for new connections on a socket */
-tINT32 sdp_inet_listen_start(struct sdp_opt *conn)
+s32 sdp_inet_listen_start(struct sdp_opt *conn)
{
unsigned long flags;
@@ -188,10 +188,10 @@
/* ========================================================================= */
/*..sdp_inet_listen_stop -- stop listening for new connections on a socket */
-tINT32 sdp_inet_listen_stop(struct sdp_opt *listen_conn)
+s32 sdp_inet_listen_stop(struct sdp_opt *listen_conn)
{
struct sdp_opt *accept_conn;
- tINT32 result;
+ s32 result;
unsigned long flags;
TS_CHECK_NULL(listen_conn, -EINVAL);
@@ -256,7 +256,7 @@
/* ========================================================================= */
/*..sdp_inet_listen_lookup -- lookup a connection in the listen list */
-struct sdp_opt *sdp_inet_listen_lookup(tUINT32 addr, tUINT16 port)
+struct sdp_opt *sdp_inet_listen_lookup(u32 addr, u16 port)
{
struct sdp_opt *conn;
unsigned long flags;
@@ -284,17 +284,17 @@
/* ========================================================================= */
/*..sdp_inet_port_get -- bind a socket to a port. */
-tINT32 sdp_inet_port_get(struct sdp_opt *conn, tUINT16 port)
+s32 sdp_inet_port_get(struct sdp_opt *conn, u16 port)
{
struct sock *sk;
struct sock *srch;
struct sdp_opt *look;
- tINT32 counter;
- tINT32 low_port;
- tINT32 top_port;
- tINT32 port_ok;
- tINT32 result;
- static tINT32 rover = -1;
+ s32 counter;
+ s32 low_port;
+ s32 top_port;
+ s32 port_ok;
+ s32 result;
+ static s32 rover = -1;
unsigned long flags;
TS_CHECK_NULL(conn, -EINVAL);
@@ -423,7 +423,7 @@
/* ========================================================================= */
/*..sdp_inet_port_put -- unbind a socket from a port. */
-tINT32 sdp_inet_port_put(struct sdp_opt *conn)
+s32 sdp_inet_port_put(struct sdp_opt *conn)
{
unsigned long flags;
@@ -456,9 +456,9 @@
/* ========================================================================= */
/*..sdp_inet_port_inherit -- inherit a port from another socket (accept) */
-tINT32 sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child)
+s32 sdp_inet_port_inherit(struct sdp_opt *parent, struct sdp_opt *child)
{
- tINT32 result;
+ s32 result;
unsigned long flags;
TS_CHECK_NULL(child, -EINVAL);
@@ -497,10 +497,10 @@
/* ========================================================================= */
/*..sdp_conn_table_insert -- insert a connection into the connection table */
-tINT32 sdp_conn_table_insert(struct sdp_opt *conn)
+s32 sdp_conn_table_insert(struct sdp_opt *conn)
{
- tINT32 counter;
- tINT32 result = -ENOMEM;
+ s32 counter;
+ s32 result = -ENOMEM;
unsigned long flags;
TS_CHECK_NULL(conn, -EINVAL);
@@ -547,9 +547,9 @@
/* ========================================================================= */
/*..sdp_conn_table_remove -- remove a connection from the connection table */
-tINT32 sdp_conn_table_remove(struct sdp_opt *conn)
+s32 sdp_conn_table_remove(struct sdp_opt *conn)
{
- tINT32 result = 0;
+ s32 result = 0;
unsigned long flags;
TS_CHECK_NULL(conn, -EINVAL);
@@ -587,7 +587,7 @@
/* ========================================================================= */
/*..sdp_conn_table_lookup -- look up connection in the connection table */
-struct sdp_opt *sdp_conn_table_lookup(tINT32 entry)
+struct sdp_opt *sdp_conn_table_lookup(s32 entry)
{
struct sdp_opt *conn;
unsigned long flags;
@@ -625,10 +625,10 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_conn_destruct -- final destructor for connection. */
-tINT32 sdp_conn_destruct(struct sdp_opt *conn)
+s32 sdp_conn_destruct(struct sdp_opt *conn)
{
- tINT32 result = 0;
- tINT32 dump = 0;
+ s32 result = 0;
+ s32 dump = 0;
if (NULL == conn) {
@@ -799,10 +799,10 @@
void sdp_conn_internal_relock(struct sdp_opt *conn)
{
struct ib_wc entry;
- tINT32 result_r;
- tINT32 result_s;
- tINT32 result;
- tINT32 rearm = 1;
+ s32 result_r;
+ s32 result_s;
+ s32 result;
+ s32 rearm = 1;
while (1) {
@@ -880,12 +880,12 @@
/* ========================================================================= */
/*..sdp_conn_cq_drain -- drain one of the the connection's CQs */
-tINT32 sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn)
+s32 sdp_conn_cq_drain(struct ib_cq *cq, struct sdp_opt *conn)
{
struct ib_wc entry;
- tINT32 result;
- tINT32 rearm = 1;
- tINT32 calls = 0;
+ s32 result;
+ s32 rearm = 1;
+ s32 calls = 0;
/*
* the function should only be called under the connection locks
* spinlock to ensure the call is serialized to avoid races.
@@ -956,7 +956,7 @@
/*..sdp_conn_internal_unlock -- lock the connection (use only from macro) */
void sdp_conn_internal_unlock(struct sdp_opt *conn)
{
- tINT32 calls = 0;
+ s32 calls = 0;
/*
* poll CQs for events.
*/
@@ -980,7 +980,7 @@
/* ========================================================================= */
/*.._sdp_conn_lock_init -- initialize connection lock */
-static tINT32 _sdp_conn_lock_init(struct sdp_opt *conn)
+static s32 _sdp_conn_lock_init(struct sdp_opt *conn)
{
TS_CHECK_NULL(conn, -EINVAL);
@@ -1191,11 +1191,11 @@
/* ========================================================================= */
/*..sdp_conn_alloc -- allocate a new socket, and init. */
-struct sdp_opt *sdp_conn_alloc(tINT32 priority, tTS_IB_CM_COMM_ID comm_id)
+struct sdp_opt *sdp_conn_alloc(s32 priority, tTS_IB_CM_COMM_ID comm_id)
{
struct sdp_opt *conn;
struct sock *sk;
- tINT32 result;
+ s32 result;
sk = sk_alloc(_dev_root_s.proto, priority, 1, _dev_root_s.sock_cache);
if (NULL == sk) {
@@ -1808,8 +1808,8 @@
{
struct sdev_hca_port *port;
struct sdev_hca *hca;
- tUINT64 subnet_prefix;
- tUINT64 guid;
+ u64 subnet_prefix;
+ u64 guid;
int hca_count;
int port_count;
int offset = 0;
@@ -1892,7 +1892,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_device_table_init -- create hca list */
-static tINT32 _sdp_device_table_init(struct sdev_root *dev_root)
+static s32 _sdp_device_table_init(struct sdev_root *dev_root)
{
#ifdef _TS_SDP_AIO_SUPPORT
tTS_IB_FMR_POOL_PARAM_STRUCT fmr_param_s;
@@ -1902,10 +1902,10 @@
struct ib_device *hca_handle;
struct sdev_hca_port *port;
struct sdev_hca *hca;
- tINT32 result;
- tINT32 hca_count;
- tINT32 port_count;
- tINT32 fmr_size;
+ s32 result;
+ s32 hca_count;
+ s32 port_count;
+ s32 fmr_size;
TS_CHECK_NULL(dev_root, -EINVAL);
@@ -2072,7 +2072,7 @@
/* ========================================================================= */
/*.._sdp_device_table_cleanup -- delete hca list */
-static tINT32 _sdp_device_table_cleanup(struct sdev_root *dev_root)
+static s32 _sdp_device_table_cleanup(struct sdev_root *dev_root)
{
struct sdev_hca_port *port;
struct sdev_hca *hca;
@@ -2130,9 +2130,9 @@
int send_buff_max,
int send_usig_max)
{
- tINT32 result;
- tINT32 byte_size;
- tINT32 page_size;
+ s32 result;
+ s32 byte_size;
+ s32 page_size;
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"INIT: creating connection table.");
@@ -2279,7 +2279,7 @@
/* ========================================================================= */
/*..sdp_conn_table_clear -- destroy connection managment and tables */
-tINT32 sdp_conn_table_clear(void)
+s32 sdp_conn_table_clear(void)
{
#if 0
struct sdp_opt *conn;
Index: drivers/infiniband/ulp/sdp/sdp_advt.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_advt.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_advt.c (working copy)
@@ -168,7 +168,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_advt_q_create - create an advertisment table */
-struct sdpc_advt_q *sdp_advt_q_create(tINT32 * result)
+struct sdpc_advt_q *sdp_advt_q_create(s32 * result)
{
struct sdpc_advt_q *table = NULL;
@@ -256,7 +256,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_main_advt_init -- initialize the advertisment caches. */
-tINT32 sdp_main_advt_init(void)
+s32 sdp_main_advt_init(void)
{
int result;
@@ -302,7 +302,7 @@
/* ========================================================================= */
/*..sdp_main_advt_cleanup -- cleanup the advertisment caches. */
-tINT32 sdp_main_advt_cleanup(void)
+s32 sdp_main_advt_cleanup(void)
{
TS_TRACE(MOD_LNX_SDP, T_VERBOSE, TRACE_FLOW_INOUT,
"INIT: Advertisment cache cleanup.");
Index: drivers/infiniband/ulp/sdp/sdp_recv.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_recv.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_recv.c (working copy)
@@ -38,10 +38,10 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_post_recv_buff -- post a single buffers for data recv */
-static tINT32 _sdp_post_recv_buff(struct sdp_opt *conn)
+static s32 _sdp_post_recv_buff(struct sdp_opt *conn)
{
struct ib_receive_param receive_param = { 0 };
- tINT32 result;
+ s32 result;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -113,11 +113,11 @@
/* ========================================================================= */
/*.._sdp_post_rdma_buff -- post a single buffers for rdma read on a conn */
-static tINT32 _sdp_post_rdma_buff(struct sdp_opt *conn)
+static s32 _sdp_post_rdma_buff(struct sdp_opt *conn)
{
struct ib_send_param send_param = { 0 };
struct sdpc_advt *advt;
- tINT32 result;
+ s32 result;
struct sdpc_buff *buff;
TS_CHECK_NULL(conn, -EINVAL);
@@ -157,7 +157,7 @@
* the correct range.
*/
buff->tail = buff->end;
- buff->data = buff->tail - min((tINT32) conn->recv_size, advt->size);
+ buff->data = buff->tail - min((s32) conn->recv_size, advt->size);
buff->lkey = conn->l_key;
buff->ib_wrid = TS_SDP_WRID_READ_FLAG | conn->recv_wrid++;
@@ -248,14 +248,14 @@
/* ========================================================================= */
/*.._sdp_post_rdma_iocb_src -- post a iocb for rdma read on a conn */
-static tINT32 _sdp_post_rdma_iocb_src(struct sdp_opt *conn)
+static s32 _sdp_post_rdma_iocb_src(struct sdp_opt *conn)
{
struct ib_send_param send_param = { 0 };
struct ib_gather_scatter sg_val;
struct sdpc_iocb *iocb;
struct sdpc_advt *advt;
- tINT32 result;
- tINT32 zcopy;
+ s32 result;
+ s32 zcopy;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -414,9 +414,9 @@
/* ========================================================================= */
/*.._sdp_post_rdma_iocb_snk -- post a iocb for rdma read on a conn */
-static tINT32 _sdp_post_rdma_iocb_snk(struct sdp_opt *conn)
+static s32 _sdp_post_rdma_iocb_snk(struct sdp_opt *conn)
{
- tINT32 result = 0;
+ s32 result = 0;
struct sdpc_iocb *iocb;
TS_CHECK_NULL(conn, -EINVAL);
@@ -534,9 +534,9 @@
/* ========================================================================= */
/*.._sdp_post_rdma -- post a rdma based requests for a connection */
-static tINT32 _sdp_post_rdma(struct sdp_opt *conn)
+static s32 _sdp_post_rdma(struct sdp_opt *conn)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
/*
@@ -635,9 +635,9 @@
/* ========================================================================= */
/*..sdp_recv_flush -- post a certain number of buffers on a connection */
-tINT32 sdp_recv_flush(struct sdp_opt *conn)
+s32 sdp_recv_flush(struct sdp_opt *conn)
{
- tINT32 result;
+ s32 result;
int counter;
TS_CHECK_NULL(conn, -EINVAL);
@@ -732,7 +732,7 @@
if ((3 > conn->l_advt_bf &&
conn->l_recv_bf > conn->l_advt_bf) ||
(TS_SDP_CONN_RECV_POST_ACK < (conn->l_recv_bf - conn->l_advt_bf) &&
- 0 == ((tUINT32) conn->snk_recv + (tUINT32) conn->src_recv))) {
+ 0 == ((u32) conn->snk_recv + (u32) conn->src_recv))) {
result = sdp_send_ctrl_ack(conn);
if (0 > result) {
@@ -757,15 +757,15 @@
#ifdef _TS_SDP_AIO_SUPPORT
/* ========================================================================= */
/*.._sdp_read_buff_iocb -- read a SDP buffer into a kvec */
-static tINT32 _sdp_read_buff_iocb(struct kvec_dst *dst,
- struct sdpc_buff *buff,
- tINT32 len)
+static s32 _sdp_read_buff_iocb(struct kvec_dst *dst,
+ struct sdpc_buff *buff,
+ s32 len)
{
void *data;
void *tail;
- tINT32 part;
- tINT32 left;
- tINT32 copy;
+ s32 part;
+ s32 left;
+ s32 copy;
TS_CHECK_NULL(dst, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -785,7 +785,7 @@
/*
* copy buffer to dst
*/
- copy = min(len, (tINT32) (buff->tail - buff->data));
+ copy = min(len, (s32) (buff->tail - buff->data));
for (left = copy; 0 < left;) {
@@ -830,16 +830,16 @@
/* ========================================================================= */
/*.._sdp_read_buff_iocb_flush -- read multiple SDP buffers into a kvec */
-tINT32 _sdp_read_buff_iocb_flush(struct sock *sk,
- struct kvec_dst *dst,
- tINT32 len)
+s32 _sdp_read_buff_iocb_flush(struct sock *sk,
+ struct kvec_dst *dst,
+ s32 len)
{
struct sdp_opt *conn;
struct sdpc_buff *buff;
- tINT32 copied = 0;
- tINT32 partial;
- tINT32 result;
- tINT32 expect;
+ s32 copied = 0;
+ s32 partial;
+ s32 result;
+ s32 expect;
TS_CHECK_NULL(sk, -EINVAL);
TS_CHECK_NULL(dst, -EINVAL);
@@ -905,11 +905,11 @@
/* ========================================================================= */
/*.._sdp_recv_buff_iocb_active -- Ease AIO read pending pressure */
-static tINT32 _sdp_recv_buff_iocb_active(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32 _sdp_recv_buff_iocb_active(struct sdp_opt *conn, struct sdpc_buff *buff)
{
#ifdef _TS_SDP_AIO_SUPPORT
struct sdpc_iocb *iocb;
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -971,12 +971,12 @@
/* ========================================================================= */
/*.._sdp_recv_buff_iocb_pending -- Ease AIO read pending pressure */
-static tINT32 _sdp_recv_buff_iocb_pending(struct sdp_opt *conn, struct sdpc_buff *buff)
+static s32 _sdp_recv_buff_iocb_pending(struct sdp_opt *conn, struct sdpc_buff *buff)
{
#ifdef _TS_SDP_AIO_SUPPORT
struct sdpc_iocb *iocb;
- tINT32 copied;
- tINT32 result;
+ s32 copied;
+ s32 result;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1043,10 +1043,10 @@
/* ========================================================================= */
/*..sdp_recv_buff -- Process a new buffer based on queue type. */
-tINT32 sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff)
+s32 sdp_recv_buff(struct sdp_opt *conn, struct sdpc_buff *buff)
{
- tINT32 result;
- tINT32 buffered;
+ s32 result;
+ s32 buffered;
TS_CHECK_NULL(conn, -EINVAL);
TS_CHECK_NULL(buff, -EINVAL);
@@ -1164,7 +1164,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_inet_recv_urg_test_func -- recv queue urgent data cleanup function */
-static tINT32 _sdp_inet_recv_urg_test_func(struct sdpc_buff *buff, void *arg)
+static s32 _sdp_inet_recv_urg_test_func(struct sdpc_buff *buff, void *arg)
{
TS_CHECK_NULL(buff, -EINVAL);
@@ -1173,10 +1173,10 @@
/* ========================================================================= */
/*.._sdp_inet_recv_urg_trav_func -- recv queue urg data retreival function */
-static tINT32 _sdp_inet_recv_urg_trav_func(struct sdpc_buff *buff, void *arg)
+static s32 _sdp_inet_recv_urg_trav_func(struct sdpc_buff *buff, void *arg)
{
- tUINT8 *value = (tUINT8 *) arg;
- tUINT8 update;
+ u8 *value = (u8 *) arg;
+ u8 update;
TS_CHECK_NULL(buff, -EINVAL);
TS_CHECK_NULL(value, -EINVAL);
@@ -1186,7 +1186,7 @@
TS_EXPECT(MOD_LNX_SDP, (buff->tail > buff->data));
update = *value;
- *value = *(tUINT8 *) (buff->tail - 1);
+ *value = *(u8 *) (buff->tail - 1);
if (0 < update) {
@@ -1202,15 +1202,15 @@
/* ========================================================================= */
/*.._sdp_inet_recv_urg -- recv urgent data from the network to user space */
-static tINT32 _sdp_inet_recv_urg(struct sock *sk,
- struct msghdr *msg,
- int size,
- int flags)
+static s32 _sdp_inet_recv_urg(struct sock *sk,
+ struct msghdr *msg,
+ int size,
+ int flags)
{
struct sdp_opt *conn;
struct sdpc_buff *buff;
- tINT32 result = 0;
- tUINT8 value;
+ s32 result = 0;
+ u8 value;
TS_CHECK_NULL(sk, -EINVAL);
TS_CHECK_NULL(msg, -EINVAL);
@@ -1287,7 +1287,7 @@
/* ========================================================================= */
/*..sdp_inet_recv -- recv data from the network to user space. */
-tINT32 sdp_inet_recv(
+s32 sdp_inet_recv(
struct kiocb *iocb,
struct socket *sock,
struct msghdr *msg,
@@ -1301,15 +1301,15 @@
struct sdpc_buff *head = NULL;
long timeout;
size_t length;
- tINT32 result = 0;
- tINT32 expect;
- tINT32 low_water;
- tINT32 copied = 0;
- tINT32 copy;
- tINT32 update;
- tINT32 free_count = 0;
- tINT8 oob = 0;
- tINT8 ack = 0;
+ s32 result = 0;
+ s32 expect;
+ s32 low_water;
+ s32 copied = 0;
+ s32 copy;
+ s32 update;
+ s32 free_count = 0;
+ s8 oob = 0;
+ s8 ack = 0;
struct sdpc_buff_q peek_queue;
TS_CHECK_NULL(sock, -EINVAL);
@@ -1657,10 +1657,10 @@
#ifdef _TS_SDP_AIO_SUPPORT
/* ========================================================================= */
/*.._sdp_inet_read_cancel_func -- lookup function for cancelation */
-static tINT32 _sdp_inet_read_cancel_func(struct sdpc_desc *element, void *arg)
+static s32 _sdp_inet_read_cancel_func(struct sdpc_desc *element, void *arg)
{
struct sdpc_iocb *iocb = (struct sdpc_iocb *) element;
- tINT32 value = (tINT32) (unsigned long)arg;
+ s32 value = (s32) (unsigned long)arg;
TS_CHECK_NULL(element, -EINVAL);
@@ -1676,13 +1676,13 @@
/* ========================================================================= */
/*.._sdp_inet_read_cancel -- cancel an IO operation */
-static tINT32 _sdp_inet_read_cancel(struct kiocb *kiocb
+static s32 _sdp_inet_read_cancel(struct kiocb *kiocb
_TS_AIO_UNUSED_CANCEL_PARAM)
{
struct sock *sk;
struct sdp_opt *conn;
struct sdpc_iocb *iocb;
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(kiocb, -ERANGE);
@@ -1839,9 +1839,9 @@
struct sock *sk;
struct sdp_opt *conn;
struct sdpc_iocb *iocb;
- tINT32 copied = 0;
- tINT32 result = 0;
- tINT32 expect;
+ s32 copied = 0;
+ s32 result = 0;
+ s32 expect;
TS_CHECK_NULL(sock, -EINVAL);
TS_CHECK_NULL(sock->sk, -EINVAL);
@@ -1864,7 +1864,7 @@
"<%d:%d:%08x>",
cb.vec->max_nr, cb.vec->nr,
cb.vec->veclet->offset, cb.vec->veclet->length,
- (tUINT32) cb.fn, req->key, req->users, (tUINT32) req->data);
+ (u32) cb.fn, req->key, req->users, (u32) req->data);
#endif
/*
* initialize memory destination
Index: drivers/infiniband/ulp/sdp/sdp_advt.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_advt.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_advt.h (working copy)
@@ -39,25 +39,25 @@
struct sdpc_advt {
struct sdpc_advt *next; /* next structure in table */
struct sdpc_advt *prev; /* previous structure in table */
- tUINT32 type; /* element type. (for generic queue) */
+ u32 type; /* element type. (for generic queue) */
struct sdpc_advt_q *table; /* table to which this object belongs */
tSDP_GENERIC_DESTRUCT_FUNC release; /* release the object */
/*
* advertisment specific
*/
u32 rkey; /* advertised buffer remote key */
- tINT32 size; /* advertised buffer size */
- tINT32 post; /* running total of data moved for advert. */
- tUINT32 wrid; /* work request completing this advertisment */
- tUINT32 flag; /* advertisment flags. */
- tUINT64 addr; /* advertised buffer virtual address */
+ s32 size; /* advertised buffer size */
+ s32 post; /* running total of data moved for advert. */
+ u32 wrid; /* work request completing this advertisment */
+ u32 flag; /* advertisment flags. */
+ u64 addr; /* advertised buffer virtual address */
}; /* struct sdpc_advt */
/*
* table for holding SDP advertisments.
*/
struct sdpc_advt_q {
struct sdpc_advt *head; /* double linked list of advertisments */
- tINT32 size; /* current number of advertisments in table */
+ s32 size; /* current number of advertisments in table */
}; /* struct sdpc_advt_q */
/*
* make size a macro.
Index: drivers/infiniband/ulp/sdp/sdp_proc.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_proc.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_proc.c (working copy)
@@ -34,17 +34,17 @@
#if 0 /* currently not used, because the no tables are not writable */
/* ========================================================================= */
/*.._sdp_proc_write_parse -- parse a buffer for write commands. */
-static tINT32 _sdp_proc_write_parse(tSDP_PROC_ENTRY_PARSE parse_list,
+static s32 _sdp_proc_write_parse(tSDP_PROC_ENTRY_PARSE parse_list,
char *buffer,
- tUINT32 size,
- tINT32 *result_array,
- tINT32 result_max,
+ u32 size,
+ s32 *result_array,
+ s32 result_max,
char **next)
{
tSDP_PROC_ENTRY_PARSE parse_item;
- tINT32 elements;
- tINT32 counter;
- tINT32 end;
+ s32 elements;
+ s32 counter;
+ s32 end;
char *name;
char *value;
/*
@@ -54,7 +54,7 @@
* double check a few constants we'll be using to make sure everything
* is safe.
*/
- if (0 != (result_max % sizeof(tINT32))) {
+ if (0 != (result_max % sizeof(s32))) {
TS_TRACE(MOD_LNX_SDP, T_TERSE, TRACE_FLOW_FATAL,
"PROC: result structure of an incorrect size. <%d>",
@@ -62,7 +62,7 @@
return -EFAULT;
}
else {
- result_max = result_max / sizeof(tINT32);
+ result_max = result_max / sizeof(s32);
}
/*
* pre parse, to determine number of elements in this line.
@@ -172,11 +172,11 @@
break;
case TS_SDP_PROC_WRITE_STR:
result_array[parse_item->id] =
- (tINT32) value;
+ (s32) value;
break;
case TS_SDP_PROC_WRITE_U64:
sscanf(value, "%Lx",
- (tUINT64 *) &
+ (u64 *) &
result_array[parse_item->id]);
break;
default:
@@ -312,10 +312,10 @@
/* ========================================================================= */
/*..sdp_main_proc_cleanup -- cleanup the proc filesystem entries */
-tINT32 sdp_main_proc_cleanup(void)
+s32 sdp_main_proc_cleanup(void)
{
tSDP_PROC_SUB_ENTRY sub_entry;
- tINT32 counter;
+ s32 counter;
TS_CHECK_NULL(_dir_root, -EINVAL);
/*
@@ -343,20 +343,20 @@
/* ========================================================================= */
/*..sdp_main_proc_init -- initialize the proc filesystem entries */
-tINT32 sdp_main_proc_init(void)
+s32 sdp_main_proc_init(void)
{
tSDP_PROC_SUB_ENTRY sub_entry;
- tINT32 result;
- tINT32 counter;
+ s32 result;
+ s32 counter;
/*
* XXX still need to check this:
* validate some assumptions the write parser will be making.
*/
- if (0 && sizeof(tINT32) != sizeof(char *)) {
+ if (0 && sizeof(s32) != sizeof(char *)) {
TS_TRACE(MOD_LNX_SDP, T_TERSE, TRACE_FLOW_FATAL,
"PROC: integers and pointers of a different size. <%d:%d>",
- sizeof(tINT32), sizeof(char *));
+ sizeof(s32), sizeof(char *));
return -EFAULT;
}
Index: drivers/infiniband/ulp/sdp/sdp_buff_p.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_buff_p.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_buff_p.h (working copy)
@@ -66,10 +66,10 @@
*/
kmem_cache_t *pool_cache; /* cache of pool objects */
- tUINT32 buff_min;
- tUINT32 buff_max;
- tUINT32 buff_cur;
- tUINT32 buff_size; /* size of each buffer in the pool */
+ u32 buff_min;
+ u32 buff_max;
+ u32 buff_cur;
+ u32 buff_size; /* size of each buffer in the pool */
tSDP_MEMORY_SEGMENT segs;
}; /* tSDP_MAIN_POOL_STRUCT */
@@ -80,7 +80,7 @@
struct tSDP_MEM_SEG_HEAD_STRUCT {
tSDP_MEMORY_SEGMENT next;
tSDP_MEMORY_SEGMENT prev;
- tUINT32 size;
+ u32 size;
}; /* tSDP_MEM_SEG_HEAD_STRUCT */
#define TS_SDP_BUFF_COUNT ((PAGE_SIZE - sizeof(tSDP_MEM_SEG_HEAD_STRUCT))/ \
Index: drivers/infiniband/ulp/sdp/sdp_proc.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_proc.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_proc.h (working copy)
@@ -58,7 +58,7 @@
struct tSDP_PROC_SUB_ENTRY_STRUCT {
char *name;
- tINT32 type;
+ s32 type;
struct proc_dir_entry *entry;
tSDP_PROC_READ_CB_FUNC read;
write_proc_t *write;
@@ -81,17 +81,17 @@
*tSDP_PROC_ENTRY_PARSE;
struct tSDP_PROC_ENTRY_WRITE_STRUCT {
- tINT16 id;
- tINT16 type;
+ s16 id;
+ s16 type;
union {
- tINT32 i;
+ s32 i;
char *s;
} value;
}; /* tSDP_PROC_WRITE_STRUCT */
struct tSDP_PROC_ENTRY_PARSE_STRUCT {
- tINT16 id;
- tINT16 type;
+ s16 id;
+ s16 type;
char *value;
}; /* tSDP_PROC_ENTRY_PARSE_STRUCT */
Index: drivers/infiniband/ulp/sdp/sdp_sent.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_sent.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_sent.c (working copy)
@@ -430,7 +430,7 @@
/* ========================================================================= */
/*..sdp_event_send -- send event handler. */
-tINT32 sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp)
+s32 sdp_event_send(struct sdp_opt *conn, struct ib_wc *comp)
{
tGW_SDP_EVENT_CB_FUNC dispatch_func;
u32 free_count = 0;
Index: drivers/infiniband/ulp/sdp/sdp_iocb.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_iocb.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_iocb.c (working copy)
@@ -38,7 +38,7 @@
#ifdef _TS_SDP_AIO_SUPPORT
struct kveclet *let;
int result;
- tINT32 counter;
+ s32 counter;
TS_CHECK_NULL(iocb, -EINVAL);
TS_CHECK_NULL(conn, -EINVAL);
@@ -47,13 +47,13 @@
*/
iocb->page_count = iocb->cb.vec->nr;
iocb->page_array =
- kmalloc((sizeof(tUINT64) * iocb->page_count), GFP_ATOMIC);
+ kmalloc((sizeof(u64) * iocb->page_count), GFP_ATOMIC);
if (NULL == iocb->page_array) {
TS_TRACE(MOD_LNX_SDP, T_VERBOSE, TRACE_FLOW_WARN,
"POST: Failed to allocate IOCB page array. <%d:%d>",
- sizeof(tUINT64) * iocb->page_count, iocb->page_count);
+ sizeof(u64) * iocb->page_count, iocb->page_count);
result = -ENOMEM;
goto error;
@@ -77,9 +77,9 @@
* register IOCBs physical memory
*/
result = ib_fmr_register_physical(conn->fmr_pool,
- (uint64_t *) iocb->page_array,
+ (u64 *) iocb->page_array,
iocb->page_count,
- (uint64_t *) & iocb->io_addr,
+ (u64 *) & iocb->io_addr,
iocb->page_offset,
&iocb->mem,
&iocb->l_key, &iocb->r_key);
@@ -229,10 +229,10 @@
/* ========================================================================= */
/*..sdp_iocb_q_lookup - find an iocb based on key, without removing */
-struct sdpc_iocb *sdp_iocb_q_lookup(struct sdpc_iocb_q *table, tUINT32 key)
+struct sdpc_iocb *sdp_iocb_q_lookup(struct sdpc_iocb_q *table, u32 key)
{
struct sdpc_iocb *iocb = NULL;
- tINT32 counter;
+ s32 counter;
TS_CHECK_NULL(table, NULL);
@@ -315,7 +315,7 @@
/* ========================================================================= */
/*..sdp_iocb_q_get_key - find an iocb based on key, and remove it */
-struct sdpc_iocb *sdp_iocb_q_get_key(struct sdpc_iocb_q *table, tUINT32 key)
+struct sdpc_iocb *sdp_iocb_q_get_key(struct sdpc_iocb_q *table, u32 key)
{
struct sdpc_iocb *iocb;
int result;
@@ -459,9 +459,9 @@
{
struct sdpc_iocb *iocb;
struct sdpc_iocb *next;
- tINT32 counter;
+ s32 counter;
int result;
- tINT32 total;
+ s32 total;
TS_CHECK_NULL(table, -EINVAL);
/*
@@ -500,7 +500,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_iocb_q_create - create an IOCB table */
-struct sdpc_iocb_q *sdp_iocb_q_create(tINT32 * result)
+struct sdpc_iocb_q *sdp_iocb_q_create(s32 * result)
{
struct sdpc_iocb_q *table = NULL;
@@ -584,7 +584,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_main_iocb_init -- initialize the advertisment caches. */
-tINT32 sdp_main_iocb_init(void)
+s32 sdp_main_iocb_init(void)
{
int result;
@@ -634,7 +634,7 @@
/* ========================================================================= */
/*..sdp_main_iocb_cleanup -- cleanup the advertisment caches. */
-tINT32 sdp_main_iocb_cleanup(void)
+s32 sdp_main_iocb_cleanup(void)
{
TS_TRACE(MOD_LNX_SDP, T_VERBOSE, TRACE_FLOW_INOUT,
"INIT: IOCB cache cleanup.");
Index: drivers/infiniband/ulp/sdp/sdp_iocb.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_iocb.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_iocb.h (working copy)
@@ -67,34 +67,34 @@
struct sdpc_iocb {
struct sdpc_iocb *next; /* next structure in table */
struct sdpc_iocb *prev; /* previous structure in table */
- tUINT32 type; /* element type. (for generic queue) */
+ u32 type; /* element type. (for generic queue) */
struct sdpc_iocb_q *table; /* table to which this iocb belongs */
tSDP_GENERIC_DESTRUCT_FUNC release; /* release the object */
/*
* iocb sepcific
*/
- tUINT32 flags; /* usage flags */
+ u32 flags; /* usage flags */
/*
* iocb information
*/
- tINT32 len; /* space left in the user buffer */
- tINT32 size; /* total size of the user buffer */
- tINT32 post; /* amount of data requested so far. */
- tUINT32 wrid; /* work request completing this IOCB */
- tUINT32 key; /* matches kiocb key for lookups */
+ s32 len; /* space left in the user buffer */
+ s32 size; /* total size of the user buffer */
+ s32 post; /* amount of data requested so far. */
+ u32 wrid; /* work request completing this IOCB */
+ u32 key; /* matches kiocb key for lookups */
/*
* IB specific information for zcopy.
*/
struct ib_fmr *mem; /* memory region handle */
u32 l_key; /* local access key */
u32 r_key; /* remote access key */
- tUINT64 io_addr; /* virtual IO address */
+ u64 io_addr; /* virtual IO address */
/*
* page list.
*/
- tUINT64 *page_array; /* list of physical pages. */
- tINT32 page_count; /* number of physical pages. */
- tINT32 page_offset; /* offset into first page. */
+ u64 *page_array; /* list of physical pages. */
+ s32 page_count; /* number of physical pages. */
+ s32 page_offset; /* offset into first page. */
/*
* AIO extension specific
*/
@@ -112,7 +112,7 @@
*/
struct sdpc_iocb_q {
struct sdpc_iocb *head; /* double linked list of IOCBs */
- tINT32 size; /* current number of IOCBs in table */
+ s32 size; /* current number of IOCBs in table */
}; /* struct sdpc_iocb_q */
/* ----------------------------------------------------------------------- */
@@ -231,7 +231,7 @@
{
void *vaddr;
#if defined(__i386__)
- tINT32 index;
+ s32 index;
if (page < highmem_start_page) {
@@ -289,7 +289,7 @@
if (in_interrupt()) {
#if 1
- tINT32 index;
+ s32 index;
/*
* This isn't necessary, but it will catch bug if
* someone tries to use an area which has been
Index: drivers/infiniband/ulp/sdp/sdp_event.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_event.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_event.c (working copy)
@@ -37,9 +37,9 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_cq_event_locked -- main per QP event handler */
-tINT32 sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn)
+s32 sdp_cq_event_locked(struct ib_wc *comp, struct sdp_opt *conn)
{
- tINT32 result = 0;
+ s32 result = 0;
TS_CHECK_NULL(comp, -EINVAL);
TS_CHECK_NULL(conn, -EINVAL);
@@ -141,9 +141,9 @@
/*..sdp_cq_event_handler -- main per QP event handler, and demuxer */
void sdp_cq_event_handler(struct ib_cq *cq, void *arg)
{
- tINT32 hashent = (unsigned long)arg;
+ s32 hashent = (unsigned long)arg;
struct sdp_opt *conn;
- tINT32 result;
+ s32 result;
unsigned long flags;
#ifdef _TS_SDP_DATA_PATH_DEBUG
@@ -222,9 +222,9 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_cm_hello_check -- validate the hello header */
-static tINT32 _sdp_cm_hello_check(struct msg_hello *msg_hello, tINT32 size)
+static s32 _sdp_cm_hello_check(struct msg_hello *msg_hello, s32 size)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(msg_hello, -EINVAL);
@@ -312,10 +312,10 @@
/* ========================================================================= */
/*.._sdp_cm_hello_ack_check -- validate the hello ack header */
-static tINT32 _sdp_cm_hello_ack_check(struct msg_hello_ack *hello_ack,
- tINT32 size)
+static s32 _sdp_cm_hello_ack_check(struct msg_hello_ack *hello_ack,
+ s32 size)
{
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(hello_ack, -EINVAL);
@@ -395,13 +395,13 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*.._sdp_cm_req -- handler for passive connection open completion */
-static tINT32 _sdp_cm_req(tTS_IB_CM_COMM_ID comm_id,
- struct ib_cm_req_received_param *param,
- void *arg)
+static s32 _sdp_cm_req(tTS_IB_CM_COMM_ID comm_id,
+ struct ib_cm_req_received_param *param,
+ void *arg)
{
struct msg_hello *msg_hello;
struct sdp_opt *conn;
- tINT32 result;
+ s32 result;
TS_CHECK_NULL(param, -EINVAL);
TS_CHECK_NULL(param->remote_private_data, -EINVAL);
@@ -410,8 +410,8 @@
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: REQ. commID <%08x> service ID <%08x> ca <%p> port <%08x>",
- (tUINT32) comm_id, (tUINT32) param->service_id,
- param->device, (tUINT32) param->port);
+ (u32) comm_id, (u32) param->service_id,
+ param->device, (u32) param->port);
/*
* check Hello Header, to determine if we want the connection.
*/
@@ -475,8 +475,8 @@
* the size we advertise to the stream peer cannot be larger then our
* internal buffer size.
*/
- conn->send_size = min((tUINT16) sdp_buff_pool_buff_size(),
- (tUINT16) (conn->send_size -
+ conn->send_size = min((u16) sdp_buff_pool_buff_size(),
+ (u16) (conn->send_size -
TS_SDP_MSG_HDR_SIZE));
result = ib_cm_callback_modify(conn->comm_id,
@@ -514,14 +514,14 @@
/* ========================================================================= */
/*.._sdp_cm_rep -- handler for active connection open completion */
-static tINT32 _sdp_cm_rep(tTS_IB_CM_COMM_ID comm_id,
- struct ib_cm_rep_received_param *param,
- struct sdp_opt *conn)
+static s32 _sdp_cm_rep(tTS_IB_CM_COMM_ID comm_id,
+ struct ib_cm_rep_received_param *param,
+ struct sdp_opt *conn)
{
struct msg_hello_ack *hello_ack;
struct sdpc_buff *buff;
- tINT32 result;
- tINT32 error;
+ s32 result;
+ s32 error;
TS_CHECK_NULL(param, -EINVAL);
TS_CHECK_NULL(param->remote_private_data, -EINVAL);
@@ -534,7 +534,7 @@
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: <%d> REP receive. comm ID <%08x> qpn <%06x:%06x>",
- conn->hashent, (tINT32) comm_id,
+ conn->hashent, (s32) comm_id,
param->local_qpn, param->remote_qpn);
/*
* lock the connection
@@ -653,12 +653,12 @@
/* ========================================================================= */
/*.._sdp_cm_idle -- handler for connection idle completion */
-static tINT32 _sdp_cm_idle(tTS_IB_CM_COMM_ID comm_id,
- struct ib_cm_idle_param *param,
- struct sdp_opt *conn)
+static s32 _sdp_cm_idle(tTS_IB_CM_COMM_ID comm_id,
+ struct ib_cm_idle_param *param,
+ struct sdp_opt *conn)
{
- tINT32 result = 0;
- tINT32 expect;
+ s32 result = 0;
+ s32 expect;
TS_CHECK_NULL(param, -EINVAL);
@@ -673,7 +673,7 @@
*/
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: <%d> IDLE, comm ID <%08x> reason <%d> state <%04x>",
- conn->hashent, (tINT32) comm_id, param->reason, conn->state);
+ conn->hashent, (s32) comm_id, param->reason, conn->state);
/*
* last comm reference
*/
@@ -767,12 +767,12 @@
/* ========================================================================= */
/*.._sdp_cm_established -- handler for connection established completion */
-static tINT32 _sdp_cm_established(tTS_IB_CM_COMM_ID comm_id,
- struct ib_cm_established_param *param,
- struct sdp_opt *conn)
+static s32 _sdp_cm_established(tTS_IB_CM_COMM_ID comm_id,
+ struct ib_cm_established_param *param,
+ struct sdp_opt *conn)
{
- tINT32 result = 0;
- tINT32 expect;
+ s32 result = 0;
+ s32 expect;
struct sdpc_buff *buff;
TS_CHECK_NULL(param, -EINVAL);
@@ -783,7 +783,7 @@
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: <%d> ESTABLISHED, comm ID <%08x> state <%04x>",
- conn->hashent, (tINT32) comm_id, conn->state);
+ conn->hashent, (s32) comm_id, conn->state);
/*
* release disconnects.
*/
@@ -895,12 +895,12 @@
/* ========================================================================= */
/*.._sdp_cm_timewait -- handler for connection Time Wait completion */
-static tINT32 _sdp_cm_timewait(tTS_IB_CM_COMM_ID comm_id,
- struct ib_cm_disconnected_param *param,
- struct sdp_opt *conn)
+static s32 _sdp_cm_timewait(tTS_IB_CM_COMM_ID comm_id,
+ struct ib_cm_disconnected_param *param,
+ struct sdp_opt *conn)
{
- tINT32 result = 0;
- tINT32 expect;
+ s32 result = 0;
+ s32 expect;
TS_CHECK_NULL(param, -EINVAL);
@@ -911,7 +911,7 @@
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: <%d> TIME WAIT, ID <%08x> reason <%d> state <%04x>",
- conn->hashent, (tINT32) comm_id, param->reason, conn->state);
+ conn->hashent, (s32) comm_id, param->reason, conn->state);
/*
* Clear out posted receives now, vs after IDLE timeout, which consumes
* too many buffers when lots of connections are being established and
@@ -990,13 +990,13 @@
/* ========================================================================= */
/*..sdp_cm_event_handler -- handler for CM state transitions request */
tTS_IB_CM_CALLBACK_RETURN sdp_cm_event_handler(tTS_IB_CM_EVENT event,
- tTS_IB_CM_COMM_ID comm_id,
- void *params,
- void *arg)
+ tTS_IB_CM_COMM_ID comm_id,
+ void *params,
+ void *arg)
{
- tINT32 hashent = (unsigned long)arg;
+ s32 hashent = (unsigned long)arg;
struct sdp_opt *conn = NULL;
- tINT32 result = 0;
+ s32 result = 0;
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"EVENT: CM state transition <%d> for comm ID <%08x> conn <%d>",
Index: drivers/infiniband/ulp/sdp/sdp_buff.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_buff.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_buff.c (working copy)
@@ -598,12 +598,12 @@
/* ========================================================================= */
/*.._sdp_buff_pool_alloc -- allocate more buffers for the main pool */
-static int _sdp_buff_pool_alloc(tSDP_MAIN_POOL m_pool, tUINT32 size)
+static int _sdp_buff_pool_alloc(tSDP_MAIN_POOL m_pool, u32 size)
{
tSDP_MEMORY_SEGMENT head_seg = NULL;
tSDP_MEMORY_SEGMENT mem_seg;
- tUINT32 counter = 0;
- tUINT32 total = 0;
+ u32 counter = 0;
+ u32 total = 0;
int result;
TS_CHECK_NULL(m_pool, -EINVAL);
@@ -674,7 +674,7 @@
/* ========================================================================= */
/*..sdp_buff_pool_init - Initialize the main buffer pool of memory */
-int sdp_buff_pool_init(tUINT32 buff_min, tUINT32 buff_max)
+int sdp_buff_pool_init(u32 buff_min, u32 buff_max)
{
int result;
Index: drivers/infiniband/ulp/sdp/sdp_dev.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_dev.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_dev.h (working copy)
@@ -80,9 +80,9 @@
#define TS_SDP_MSG_SERVICE_ID_VALUE (0x000000000001FFFFULL)
#define TS_SDP_MSG_SERVICE_ID_MASK (0xFFFFFFFFFFFF0000ULL)
-#define TS_SDP_MSG_SID_TO_PORT(sid) ((tUINT16)((sid) & 0xFFFF))
+#define TS_SDP_MSG_SID_TO_PORT(sid) ((u16)((sid) & 0xFFFF))
#define TS_SDP_MSG_PORT_TO_SID(port) \
- ((tUINT64)(TS_SDP_MSG_SERVICE_ID_RANGE | ((port) & 0xFFFF)))
+ ((u64)(TS_SDP_MSG_SERVICE_ID_RANGE | ((port) & 0xFFFF)))
/*
* invalid socket identifier, top entry in table.
*/
@@ -149,7 +149,7 @@
struct ib_mr *mem_h; /* registered memory region */
u32 l_key; /* local key */
u32 r_key; /* remote key */
- uint64_t iova; /* address */
+ u64 iova; /* address */
struct ib_fmr_pool *fmr_pool; /* fast memory for Zcopy */
struct sdev_hca_port *port_list; /* ports on this HCA */
struct sdev_hca *next; /* next HCA in the list */
Index: drivers/infiniband/ulp/sdp/sdp_queue.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_queue.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_queue.c (working copy)
@@ -175,7 +175,7 @@
void *arg)
{
struct sdpc_desc *element;
- tINT32 counter;
+ s32 counter;
TS_CHECK_NULL(table, NULL);
TS_CHECK_NULL(lookup_func, NULL);
@@ -341,7 +341,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_desc_q_create - create/allocate a generic table */
-struct sdpc_desc_q *sdp_desc_q_create(tINT32 *result)
+struct sdpc_desc_q *sdp_desc_q_create(s32 *result)
{
struct sdpc_desc_q *table = NULL;
@@ -432,7 +432,7 @@
/* --------------------------------------------------------------------- */
/* ========================================================================= */
/*..sdp_main_desc_init -- initialize the generic table caches. */
-tINT32 sdp_main_desc_init(void)
+s32 sdp_main_desc_init(void)
{
int result;
@@ -465,7 +465,7 @@
/* ========================================================================= */
/*..sdp_main_desc_cleanup -- cleanup the generic table caches. */
-tINT32 sdp_main_desc_cleanup(void)
+s32 sdp_main_desc_cleanup(void)
{
TS_TRACE(MOD_LNX_SDP, T_VERBOSE, TRACE_FLOW_INOUT,
"INIT: Generic table cache cleanup.");
Index: drivers/infiniband/ulp/sdp/sdp_post.c
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_post.c (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_post.c (working copy)
@@ -98,8 +98,8 @@
TS_TRACE(MOD_LNX_SDP, T_VERY_VERBOSE, TRACE_FLOW_INOUT,
"POST: <%d> Path record lookup complete <%016llx:%016llx:%d>",
- conn->hashent, cpu_to_be64(*(tUINT64 *) path->dgid),
- cpu_to_be64(*(tUINT64 *) (path->dgid + sizeof(tUINT64))),
+ conn->hashent, cpu_to_be64(*(u64 *) path->dgid),
+ cpu_to_be64(*(u64 *) (path->dgid + sizeof(u64))),
path->dlid);
/*
* allocate IB resources.
Index: drivers/infiniband/ulp/sdp/sdp_buff.h
===================================================================
--- drivers/infiniband/ulp/sdp/sdp_buff.h (revision 615)
+++ drivers/infiniband/ulp/sdp/sdp_buff.h (working copy)
@@ -33,7 +33,7 @@
*/
struct sdpc_buff_q {
struct sdpc_buff *head; /* double linked list of buffers */
- tUINT32 size; /* current number of buffers allocated to the pool */
+ u32 size; /* current number of buffers allocated to the pool */
#ifdef _TS_SDP_DEBUG_POOL_NAME
char *name; /* pointer to pools name */
#endif
Index: drivers/infiniband/include/ib_legacy_types.h
===================================================================
--- drivers/infiniband/include/ib_legacy_types.h (revision 615)
+++ drivers/infiniband/include/ib_legacy_types.h (working copy)
@@ -41,14 +41,6 @@
* should not be used).
*/
typedef int tBOOLEAN;
-typedef char tINT8;
-typedef unsigned char tUINT8;
-typedef short tINT16;
-typedef unsigned short tUINT16;
-typedef int tINT32;
-typedef unsigned int tUINT32;
-typedef long long tINT64;
-typedef unsigned long long tUINT64;
/*
* Generic type for returning pass/fail information back from subroutines
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20040809/be4c3645/attachment.sig>
More information about the general
mailing list