b=16150

i=nikita
i=robert
winnt libcfs/lnet cleanup

diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index 03ec53c..53bda1f 100644 (file)
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -421,6 +421,13 @@ struct ll_async_page {
         struct inode   *llap_inode;
 };
 
+static inline struct ll_async_page *llap_from_cookie(void *ptr)
+{
+        struct ll_async_page *ap = ptr;
+        LASSERT(ap->llap_magic == LLAP_MAGIC);
+        return ap;
+}
+
 static void llu_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
 {
         struct ll_async_page *llap;
@@ -429,7 +436,7 @@ static void llu_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
         obd_flag valid_flags;
         ENTRY;
 
-        llap = LLAP_FROM_COOKIE(data);
+        llap = llap_from_cookie(data);
         inode = llap->llap_inode;
         lsm = llu_i2info(inode)->lli_smd;
 
@@ -451,7 +458,7 @@ static void llu_ap_update_obdo(void *data, int cmd, struct obdo *oa,
         struct ll_async_page *llap;
         ENTRY;
 
-        llap = LLAP_FROM_COOKIE(data);
+        llap = llap_from_cookie(data);
         obdo_from_inode(oa, llap->llap_inode, valid);
 
         EXIT;
@@ -464,7 +471,7 @@ static int llu_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
         cfs_page_t *page;
         ENTRY;
 
-        llap = LLAP_FROM_COOKIE(data);
+        llap = llap_from_cookie(data);
         llap->llap_queued = 0;
         page = llap->llap_page;