staging: lustre: lnet: change lnet_md_t to proper structure

Change lnet_md_t from typedef to proper structure.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/20831
Reviewed-by: Olaf Weber <olaf@sgi.com>
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/lnet/api.h b/drivers/staging/lustre/include/linux/lnet/api.h
index 2585dbba65178fa07cd8a73733e52b1351022ed3..8609206d557ccd6714c8ddb0475619864f75c1e6 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/api.h
+++ b/drivers/staging/lustre/include/linux/lnet/api.h
@@ -125,11 +125,11 @@ int LNetMEUnlink(struct lnet_handle_me current_in);
  * @{
  */
 int LNetMDAttach(struct lnet_handle_me current_in,
-                lnet_md_t         md_in,
+                struct lnet_md md_in,
                 lnet_unlink_t     unlink_in,
                 struct lnet_handle_md *md_handle_out);
 
-int LNetMDBind(lnet_md_t          md_in,
+int LNetMDBind(struct lnet_md md_in,
               lnet_unlink_t       unlink_in,
               struct lnet_handle_md *md_handle_out);
 

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
index 4a1e0a1e4bdc6ae3b12641f155510e1b8f26a5de..a6cf5bef41e5016b3c884cfd763cfeb39a6acf84 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h
@@ -194,7 +194,7 @@ lnet_eq_free(struct lnet_eq *eq)
 }
 
 static inline struct lnet_libmd *
-lnet_md_alloc(lnet_md_t *umd)
+lnet_md_alloc(struct lnet_md *umd)
 {
        struct lnet_libmd *md;
        unsigned int size;
@@ -626,7 +626,7 @@ void lnet_copy_kiov2iter(struct iov_iter *to,
 void lnet_me_unlink(struct lnet_me *me);
 
 void lnet_md_unlink(struct lnet_libmd *md);
-void lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd);
+void lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_md *umd);
 
 void lnet_register_lnd(struct lnet_lnd *lnd);
 void lnet_unregister_lnd(struct lnet_lnd *lnd);

diff --git a/drivers/staging/lustre/include/linux/lnet/types.h b/drivers/staging/lustre/include/linux/lnet/types.h
index d2af335808ddb07a5a2dec9b1b4038550a3fc9dc..bc3f3e3b21b78dd6a30d701b51d6eb9be47d6b65 100644 (file)
--- a/drivers/staging/lustre/include/linux/lnet/types.h
+++ b/drivers/staging/lustre/include/linux/lnet/types.h
@@ -377,7 +377,7 @@ typedef enum {
  * Defines the visible parts of a memory descriptor. Values of this type
  * are used to initialize memory descriptors.
  */
-typedef struct {
+struct lnet_md {
        /**
         * Specify the memory region associated with the memory descriptor.
         * If the options field has:
@@ -471,7 +471,7 @@ typedef struct {
         * descriptor are not logged.
         */
        struct lnet_handle_eq eq_handle;
-} lnet_md_t;
+};
 
 /*
  * Max Transfer Unit (minimum supported everywhere).
@@ -485,29 +485,29 @@ typedef struct {
 #define LNET_MAX_IOV   256
 
 /**
- * Options for the MD structure. See lnet_md_t::options.
+ * Options for the MD structure. See lnet_md::options.
  */
 #define LNET_MD_OP_PUT         (1 << 0)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_OP_GET         (1 << 1)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_MANAGE_REMOTE  (1 << 2)
 /* unused                      (1 << 3) */
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_TRUNCATE       (1 << 4)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_ACK_DISABLE    (1 << 5)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_IOVEC          (1 << 6)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_MAX_SIZE       (1 << 7)
-/** See lnet_md_t::options. */
+/** See lnet_md::options. */
 #define LNET_MD_KIOV           (1 << 8)
 
 /* For compatibility with Cray Portals */
 #define LNET_MD_PHYS           0
 
-/** Infinite threshold on MD operations. See lnet_md_t::threshold */
+/** Infinite threshold on MD operations. See lnet_md::threshold */
 #define LNET_MD_THRESH_INF     (-1)
 
 /* NB lustre portals uses struct iovec internally! */
@@ -591,7 +591,7 @@ typedef struct {
         * The length (in bytes) of the data that was manipulated by the
         * operation. For truncated operations, the manipulated length will be
         * the number of bytes specified by the MD (possibly with an offset,
-        * see lnet_md_t). For all other operations, the manipulated length
+        * see lnet_md). For all other operations, the manipulated length
         * will be the length of the requested operation, i.e. rlength.
         */
        unsigned int            mlength;
@@ -605,7 +605,7 @@ typedef struct {
         * been processed. In particular, the threshold field in md will
         * reflect the value of the threshold after the operation occurred.
         */
-       lnet_md_t               md;
+       struct lnet_md          md;
        /**
         * 64 bits of out-of-band user data. Only valid for LNET_EVENT_PUT.
         * \see LNetPut
@@ -627,7 +627,7 @@ typedef struct {
         * The displacement (in bytes) into the memory region that the
         * operation used. The offset can be determined by the operation for
         * a remote managed MD or by the local MD.
-        * \see lnet_md_t::options
+        * \see lnet_md::options
         */
        unsigned int            offset;
        /**
@@ -660,7 +660,7 @@ typedef void (*lnet_eq_handler_t)(lnet_event_t *event);
  * operation completes (i.e., when the data has been written to a MD of the
  * target process).
  *
- * \see lnet_md_t::options for the discussion on LNET_MD_ACK_DISABLE by which
+ * \see lnet_md::options for the discussion on LNET_MD_ACK_DISABLE by which
  * acknowledgments can be disabled for a MD.
  */
 typedef enum {

diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 34b9b102749c6221cd8c8dd757a29e6f819c9db8..53c9427076063ffd0a022e869480f2f6cc6544a5 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -903,7 +903,7 @@ lnet_ping_info_setup(struct lnet_ping_info **ppinfo,
 {
        lnet_process_id_t id = {LNET_NID_ANY, LNET_PID_ANY};
        struct lnet_handle_me me_handle;
-       lnet_md_t md = { NULL };
+       struct lnet_md md = { NULL };
        int rc, rc2;
 
        if (set_eq) {
@@ -2134,7 +2134,7 @@ static int lnet_ping(lnet_process_id_t id, int timeout_ms,
        struct lnet_handle_eq eqh;
        struct lnet_handle_md mdh;
        lnet_event_t event;
-       lnet_md_t md = { NULL };
+       struct lnet_md md = { NULL };
        int which;
        int unlinked = 0;
        int replied = 0;

diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c
index bb832c592c5562aae87fca0e68a69742d302ebb7..a3f892703cfc23f85e407d9c0b906765ead3efbd 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/lib-md.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-md.c
@@ -84,7 +84,7 @@ lnet_md_unlink(struct lnet_libmd *md)
 }
 
 static int
-lnet_md_build(struct lnet_libmd *lmd, lnet_md_t *umd, int unlink)
+lnet_md_build(struct lnet_libmd *lmd, struct lnet_md *umd, int unlink)
 {
        int i;
        unsigned int niov;
@@ -204,7 +204,7 @@ lnet_md_link(struct lnet_libmd *md, struct lnet_handle_eq eq_handle, int cpt)
 
 /* must be called with lnet_res_lock held */
 void
-lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd)
+lnet_md_deconstruct(struct lnet_libmd *lmd, struct lnet_md *umd)
 {
        /* NB this doesn't copy out all the iov entries so when a
         * discontiguous MD is copied out, the target gets to know the
@@ -223,7 +223,7 @@ lnet_md_deconstruct(struct lnet_libmd *lmd, lnet_md_t *umd)
 }
 
 static int
-lnet_md_validate(lnet_md_t *umd)
+lnet_md_validate(struct lnet_md *umd)
 {
        if (!umd->start && umd->length) {
                CERROR("MD start pointer can not be NULL with length %u\n",
@@ -267,7 +267,7 @@ lnet_md_validate(lnet_md_t *umd)
  * a MD.
  */
 int
-LNetMDAttach(struct lnet_handle_me meh, lnet_md_t umd,
+LNetMDAttach(struct lnet_handle_me meh, struct lnet_md umd,
             lnet_unlink_t unlink, struct lnet_handle_md *handle)
 {
        LIST_HEAD(matches);
@@ -350,7 +350,7 @@ EXPORT_SYMBOL(LNetMDAttach);
  * LNetInvalidateHandle() on it.
  */
 int
-LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink,
+LNetMDBind(struct lnet_md umd, lnet_unlink_t unlink,
           struct lnet_handle_md *handle)
 {
        struct lnet_libmd *md;

diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c
index effa0fe75b3a59fff3072b902194c78d8c13358c..c9edc1077c33c3c6d0286980496295881f6eee96 100644 (file)
--- a/drivers/staging/lustre/lnet/lnet/router.c
+++ b/drivers/staging/lustre/lnet/lnet/router.c
@@ -905,7 +905,7 @@ lnet_create_rc_data_locked(struct lnet_peer *gateway)
 {
        struct lnet_rc_data *rcd = NULL;
        struct lnet_ping_info *pi;
-       lnet_md_t md;
+       struct lnet_md md;
        int rc;
        int i;
 

diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c
index 2e2e5cf576a1eec98a46e3372c42a42c0ffd939d..bf379a4373bab6cbfcd0d8240d0e52a12bd9cf70 100644 (file)
--- a/drivers/staging/lustre/lnet/selftest/rpc.c
+++ b/drivers/staging/lustre/lnet/selftest/rpc.c
@@ -359,7 +359,7 @@ srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf,
                       struct lnet_handle_md *mdh, struct srpc_event *ev)
 {
        int rc;
-       lnet_md_t md;
+       struct lnet_md md;
        struct lnet_handle_me meh;
 
        rc = LNetMEAttach(portal, peer, matchbits, 0, LNET_UNLINK,
@@ -398,7 +398,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len,
                      struct lnet_handle_md *mdh, struct srpc_event *ev)
 {
        int rc;
-       lnet_md_t md;
+       struct lnet_md md;
 
        md.user_ptr = ev;
        md.start = buf;

diff --git a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
index bb6d76aa09b887f37e32b23dfbc0491372c9c274..befd73cacc40c1c87f77771d62f98d46e017db62 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/niobuf.c
@@ -49,7 +49,7 @@ static int ptl_send_buf(struct lnet_handle_md *mdh, void *base, int len,
                        unsigned int offset)
 {
        int rc;
-       lnet_md_t md;
+       struct lnet_md md;
 
        LASSERT(portal != 0);
        CDEBUG(D_INFO, "conn=%p id %s\n", conn, libcfs_id2str(conn->c_peer));
@@ -116,7 +116,7 @@ static int ptlrpc_register_bulk(struct ptlrpc_request *req)
        int total_md;
        u64 mbits;
        struct lnet_handle_me me_h;
-       lnet_md_t md;
+       struct lnet_md md;
 
        if (OBD_FAIL_CHECK(OBD_FAIL_PTLRPC_BULK_GET_NET))
                return 0;
@@ -473,7 +473,7 @@ int ptl_send_rpc(struct ptlrpc_request *request, int noreply)
        int mpflag = 0;
        struct ptlrpc_connection *connection;
        struct lnet_handle_me reply_me_h;
-       lnet_md_t reply_md;
+       struct lnet_md reply_md;
        struct obd_import *imp = request->rq_import;
        struct obd_device *obd = imp->imp_obd;
 
@@ -721,7 +721,7 @@ int ptlrpc_register_rqbd(struct ptlrpc_request_buffer_desc *rqbd)
        struct ptlrpc_service *service = rqbd->rqbd_svcpt->scp_service;
        static lnet_process_id_t match_id = {LNET_NID_ANY, LNET_PID_ANY};
        int rc;
-       lnet_md_t md;
+       struct lnet_md md;
        struct lnet_handle_me me_h;
 
        CDEBUG(D_NET, "LNetMEAttach: portal %d\n",

diff --git a/drivers/staging/lustre/lustre/ptlrpc/pers.c b/drivers/staging/lustre/lustre/ptlrpc/pers.c
index 601acb84f343973fac0e02241d6c46764b7d3002..df4994f406e90ce1aa7030a40e8e818c48d8be3a 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/pers.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pers.c
@@ -40,7 +40,7 @@
 
 #include "ptlrpc_internal.h"
 
-void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
+void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
                         int mdidx)
 {
        int offset = mdidx * LNET_MAX_IOV;

diff --git a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
index 8e6a805487ec719bfa55f2a23ce5232f9d62b161..d2707a323c47ea05b8cc0b6455202520c7c295f2 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
+++ b/drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h
@@ -234,7 +234,7 @@ extern struct ptlrpc_nrs_pol_conf nrs_conf_fifo;
 int ptlrpc_expire_one_request(struct ptlrpc_request *req, int async_unlink);
 
 /* pers.c */
-void ptlrpc_fill_bulk_md(lnet_md_t *md, struct ptlrpc_bulk_desc *desc,
+void ptlrpc_fill_bulk_md(struct lnet_md *md, struct ptlrpc_bulk_desc *desc,
                         int mdcnt);
 
 /* pack_generic.c */