i=nikita
i=robert
winnt libcfs/lnet cleanup
void *lap_caller_data;
};
void *lap_caller_data;
};
-#define LAP_FROM_COOKIE(c) \
- (LASSERT(((struct lov_async_page *)(c))->lap_magic == LOV_AP_MAGIC), \
- (struct lov_async_page *)(c))
+static inline struct lov_async_page *lap_from_cookie(void *ptr)
+{
+ struct lov_async_page *ap = ptr;
+ LASSERT(ap->lap_magic == LOV_AP_MAGIC);
+ return ap;
+}
extern cfs_mem_cache_t *lov_oinfo_slab;
extern cfs_mem_cache_t *lov_oinfo_slab;
static int lov_ap_make_ready(void *data, int cmd)
{
static int lov_ap_make_ready(void *data, int cmd)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
return lap->lap_caller_ops->ap_make_ready(lap->lap_caller_data, cmd);
}
static int lov_ap_refresh_count(void *data, int cmd)
{
return lap->lap_caller_ops->ap_make_ready(lap->lap_caller_data, cmd);
}
static int lov_ap_refresh_count(void *data, int cmd)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
return lap->lap_caller_ops->ap_refresh_count(lap->lap_caller_data,
cmd);
return lap->lap_caller_ops->ap_refresh_count(lap->lap_caller_data,
cmd);
static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
{
static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
lap->lap_caller_ops->ap_fill_obdo(lap->lap_caller_data, cmd, oa);
/* XXX woah, shouldn't we be altering more here? size? */
lap->lap_caller_ops->ap_fill_obdo(lap->lap_caller_data, cmd, oa);
/* XXX woah, shouldn't we be altering more here? size? */
static void lov_ap_update_obdo(void *data, int cmd, struct obdo *oa,
obd_valid valid)
{
static void lov_ap_update_obdo(void *data, int cmd, struct obdo *oa,
obd_valid valid)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
lap->lap_caller_ops->ap_update_obdo(lap->lap_caller_data, cmd,oa,valid);
}
static int lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
{
lap->lap_caller_ops->ap_update_obdo(lap->lap_caller_data, cmd,oa,valid);
}
static int lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
/* in a raid1 regime this would down a count of many ios
* in flight, onl calling the caller_ops completion when all
/* in a raid1 regime this would down a count of many ios
* in flight, onl calling the caller_ops completion when all
static struct obd_capa *lov_ap_lookup_capa(void *data, int cmd)
{
static struct obd_capa *lov_ap_lookup_capa(void *data, int cmd)
{
- struct lov_async_page *lap = LAP_FROM_COOKIE(data);
+ struct lov_async_page *lap = lap_from_cookie(data);
return lap->lap_caller_ops->ap_lookup_capa(lap->lap_caller_data, cmd);
}
return lap->lap_caller_ops->ap_lookup_capa(lap->lap_caller_data, cmd);
}
- lap = LAP_FROM_COOKIE(cookie);
+ lap = lap_from_cookie(cookie);
loi = lsm->lsm_oinfo[lap->lap_stripe];
loi = lsm->lsm_oinfo[lap->lap_stripe];
- lap = LAP_FROM_COOKIE(cookie);
+ lap = lap_from_cookie(cookie);
loi = lsm->lsm_oinfo[lap->lap_stripe];
loi = lsm->lsm_oinfo[lap->lap_stripe];
- lap = LAP_FROM_COOKIE(cookie);
+ lap = lap_from_cookie(cookie);
loi = lsm->lsm_oinfo[lap->lap_stripe];
loi = lsm->lsm_oinfo[lap->lap_stripe];
- lap = LAP_FROM_COOKIE(cookie);
+ lap = lap_from_cookie(cookie);
loi = lsm->lsm_oinfo[lap->lap_stripe];
loi = lsm->lsm_oinfo[lap->lap_stripe];
struct list_head eap_item;
};
struct list_head eap_item;
};
-#define EAP_FROM_COOKIE(c) \
- (LASSERT(((struct echo_async_page *)(c))->eap_magic == EAP_MAGIC), \
- (struct echo_async_page *)(c))
+static inline struct echo_async_page *eap_from_cookie(void *ptr)
+{
+ struct echo_async_page *ap = ptr;
+ LASSERT(ap->eap_magic == EAP_MAGIC);
+ return ap;
+}
struct echo_async_state {
spinlock_t eas_lock;
struct echo_async_state {
spinlock_t eas_lock;
}
static void ec_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
{
}
static void ec_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
{
- struct echo_async_page *eap = EAP_FROM_COOKIE(data);
+ struct echo_async_page *eap = eap_from_cookie(data);
memcpy(oa, &eap->eap_eas->eas_oa, sizeof(*oa));
}
static int ec_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
{
memcpy(oa, &eap->eap_eas->eas_oa, sizeof(*oa));
}
static int ec_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
{
- struct echo_async_page *eap = EAP_FROM_COOKIE(data);
struct echo_async_state *eas;
struct echo_async_state *eas;
+ struct echo_async_page *eap = eap_from_cookie(data);
#define oap_count oap_brw_page.count
#define oap_brw_flags oap_brw_page.flag
#define oap_count oap_brw_page.count
#define oap_brw_flags oap_brw_page.flag
-#define OAP_FROM_COOKIE(c) \
- (LASSERT(((struct osc_async_page *)(c))->oap_magic == OAP_MAGIC), \
- (struct osc_async_page *)(c))
-
struct osc_cache_waiter {
struct list_head ocw_entry;
cfs_waitq_t ocw_waitq;
struct osc_cache_waiter {
struct list_head ocw_entry;
cfs_waitq_t ocw_waitq;
cfs_waitq_init(&desc->bd_waitq);
desc->bd_max_iov = npages;
desc->bd_iov_count = 0;
cfs_waitq_init(&desc->bd_waitq);
desc->bd_max_iov = npages;
desc->bd_iov_count = 0;
- desc->bd_md_h = LNET_INVALID_HANDLE;
+ LNetInvalidateHandle(&desc->bd_md_h);
desc->bd_portal = portal;
desc->bd_type = type;
desc->bd_portal = portal;
desc->bd_type = type;
#undef LASSERT
#undef LASSERTF
#undef LASSERT
#undef LASSERTF
-#define CLASSERT(cond) ({ switch(42) { case (cond): case 0: break; } })
#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
#define LASSERTF(cond, fmt, arg) if (!(cond)) { printf("failed '" #cond "'" fmt, arg);ret = 1;}
#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
#define LASSERTF(cond, fmt, arg) if (!(cond)) { printf("failed '" #cond "'" fmt, arg);ret = 1;}
#undef LASSERT
#undef LASSERTF
#undef LASSERT
#undef LASSERTF
-#define CLASSERT(cond) ({ switch(42) { case (cond): case 0: break; } })
#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
#define LASSERTF(cond, fmt, arg) if (!(cond)) { printf("failed '" #cond "'" fmt, arg);ret = 1;}
#define LASSERT(cond) if (!(cond)) { printf("failed " #cond "\n"); ret = 1; }
#define LASSERTF(cond, fmt, arg) if (!(cond)) { printf("failed '" #cond "'" fmt, arg);ret = 1;}