b=16150

i=nikita
i=robert
winnt libcfs/lnet cleanup

diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h
index 9a1d66d..c9468ae 100644 (file)
--- a/lustre/lov/lov_internal.h
+++ b/lustre/lov/lov_internal.h
@@ -95,9 +95,12 @@ struct lov_async_page {
         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;
 

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 5d3f3cc..68ac43b 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -1797,14 +1797,14 @@ out:
 
 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)
 {
-        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);
@@ -1812,7 +1812,7 @@ static int lov_ap_refresh_count(void *data, int cmd)
 
 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? */
@@ -1825,14 +1825,14 @@ static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
 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)
 {
-        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
@@ -1843,7 +1843,7 @@ static int lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
 
 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);
 }
 
@@ -1939,7 +1939,7 @@ static int lov_queue_async_io(struct obd_export *exp,
 
         ASSERT_LSM_MAGIC(lsm);
 
-        lap = LAP_FROM_COOKIE(cookie);
+        lap = lap_from_cookie(cookie);
 
         loi = lsm->lsm_oinfo[lap->lap_stripe];
 
@@ -1962,7 +1962,7 @@ static int lov_set_async_flags(struct obd_export *exp,
 
         ASSERT_LSM_MAGIC(lsm);
 
-        lap = LAP_FROM_COOKIE(cookie);
+        lap = lap_from_cookie(cookie);
 
         loi = lsm->lsm_oinfo[lap->lap_stripe];
 
@@ -1986,7 +1986,7 @@ static int lov_queue_group_io(struct obd_export *exp,
 
         ASSERT_LSM_MAGIC(lsm);
 
-        lap = LAP_FROM_COOKIE(cookie);
+        lap = lap_from_cookie(cookie);
 
         loi = lsm->lsm_oinfo[lap->lap_stripe];
 
@@ -2039,7 +2039,7 @@ static int lov_teardown_async_page(struct obd_export *exp,
 
         ASSERT_LSM_MAGIC(lsm);
 
-        lap = LAP_FROM_COOKIE(cookie);
+        lap = lap_from_cookie(cookie);
 
         loi = lsm->lsm_oinfo[lap->lap_stripe];
 

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index ffd1116..72297c3 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -605,9 +605,12 @@ struct echo_async_page {
         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;
@@ -646,15 +649,15 @@ static int ec_ap_refresh_count(void *data, int cmd)
 }
 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)
 {
-        struct echo_async_page *eap = EAP_FROM_COOKIE(data);
         struct echo_async_state *eas;
+        struct echo_async_page *eap = eap_from_cookie(data);
 
         eas = eap->eap_eas;
 

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 2ee22ea..d6c979b 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -71,10 +71,6 @@ struct osc_async_page {
 #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;

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 42a456f..5171086 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -94,7 +94,7 @@ static inline struct ptlrpc_bulk_desc *new_bulk(int npages, int type, int portal
         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;
 

diff --git a/lustre/utils/wirehdr.c b/lustre/utils/wirehdr.c
index 6358b6a..d8debb5 100644 (file)
--- a/lustre/utils/wirehdr.c
+++ b/lustre/utils/wirehdr.c
@@ -42,7 +42,6 @@
 
 #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;}
 

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 4c64674..f5a777b 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -42,7 +42,6 @@
 
 #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;}