Branch HEAD

[fs/lustre-release.git] / lustre / include / lustre_capa.h

diff --git a/lustre/include/lustre_capa.h b/lustre/include/lustre_capa.h
index 7f65a44..9b9b21b 100644 (file)
--- a/lustre/include/lustre_capa.h
+++ b/lustre/include/lustre_capa.h
@@ -192,7 +192,7 @@ static inline struct obd_capa *alloc_capa(int site)
         if (unlikely(site != CAPA_SITE_CLIENT && site != CAPA_SITE_SERVER))
                 return ERR_PTR(-EINVAL);
 
-        OBD_SLAB_ALLOC(ocapa, capa_cachep, GFP_KERNEL, sizeof(*ocapa));
+        OBD_SLAB_ALLOC_PTR(ocapa, capa_cachep);
         if (unlikely(!ocapa))
                 return ERR_PTR(-ENOMEM);
 
@@ -285,17 +285,17 @@ static inline int capa_opc_supported(struct lustre_capa *capa, __u64 opc)
 }
 
 static inline struct lustre_capa *
-lustre_unpack_capa(struct lustre_msg *msg, unsigned int offset)
+lustre_unpack_incoming_capa(struct ptlrpc_request *req, unsigned int offset)
 {
         struct lustre_capa *capa;
 
-        capa = lustre_swab_buf(msg, offset, sizeof(*capa),
-                               lustre_swab_lustre_capa);
+        capa = lustre_swab_reqbuf(req, offset, sizeof(*capa),
+                                  lustre_swab_lustre_capa);
         if (capa == NULL)
                 CERROR("bufcount %u, bufsize %u\n",
-                       lustre_msg_bufcount(msg),
-                       (lustre_msg_bufcount(msg) <= offset) ?
-                                -1 : lustre_msg_buflen(msg, offset));
+                       lustre_msg_bufcount(req->rq_reqmsg),
+                       (lustre_msg_bufcount(req->rq_reqmsg) <= offset) ?
+                                -1 : lustre_msg_buflen(req->rq_reqmsg, offset));
 
         return capa;
 }