These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lnet / lnet / lib-me.c

diff --git a/kernel/drivers/staging/lustre/lnet/lnet/lib-me.c b/kernel/drivers/staging/lustre/lnet/lnet/lib-me.c
index a3f9292..42fc99e 100644 (file)
--- a/kernel/drivers/staging/lustre/lnet/lnet/lib-me.c
+++ b/kernel/drivers/staging/lustre/lnet/lnet/lib-me.c
@@ -80,8 +80,8 @@ LNetMEAttach(unsigned int portal,
             lnet_handle_me_t *handle)
 {
        struct lnet_match_table *mtable;
-       struct lnet_me          *me;
-       struct list_head                *head;
+       struct lnet_me *me;
+       struct list_head *head;
 
        LASSERT(the_lnet.ln_init);
        LASSERT(the_lnet.ln_refcount > 0);
@@ -151,10 +151,10 @@ LNetMEInsert(lnet_handle_me_t current_meh,
             lnet_unlink_t unlink, lnet_ins_pos_t pos,
             lnet_handle_me_t *handle)
 {
-       struct lnet_me          *current_me;
-       struct lnet_me          *new_me;
-       struct lnet_portal      *ptl;
-       int                     cpt;
+       struct lnet_me *current_me;
+       struct lnet_me *new_me;
+       struct lnet_portal *ptl;
+       int cpt;
 
        LASSERT(the_lnet.ln_init);
        LASSERT(the_lnet.ln_refcount > 0);
@@ -172,7 +172,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
 
        current_me = lnet_handle2me(&current_meh);
        if (current_me == NULL) {
-               lnet_me_free_locked(new_me);
+               lnet_me_free(new_me);
 
                lnet_res_unlock(cpt);
                return -ENOENT;
@@ -183,7 +183,7 @@ LNetMEInsert(lnet_handle_me_t current_meh,
        ptl = the_lnet.ln_portals[current_me->me_portal];
        if (lnet_ptl_is_unique(ptl)) {
                /* nosense to insertion on unique portal */
-               lnet_me_free_locked(new_me);
+               lnet_me_free(new_me);
                lnet_res_unlock(cpt);
                return -EPERM;
        }
@@ -228,10 +228,10 @@ EXPORT_SYMBOL(LNetMEInsert);
 int
 LNetMEUnlink(lnet_handle_me_t meh)
 {
-       lnet_me_t       *me;
-       lnet_libmd_t    *md;
-       lnet_event_t    ev;
-       int             cpt;
+       lnet_me_t *me;
+       lnet_libmd_t *md;
+       lnet_event_t ev;
+       int cpt;
 
        LASSERT(the_lnet.ln_init);
        LASSERT(the_lnet.ln_refcount > 0);
@@ -276,7 +276,7 @@ lnet_me_unlink(lnet_me_t *me)
        }
 
        lnet_res_lh_invalidate(&me->me_lh);
-       lnet_me_free_locked(me);
+       lnet_me_free(me);
 }
 
 #if 0