Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8056 build: announce linux kernel 4.5.7 support
[fs/lustre-release.git]
/
lnet
/
lnet
/
lib-md.c
diff --git
a/lnet/lnet/lib-md.c
b/lnet/lnet/lib-md.c
index
c70b4da
..
c139934
100644
(file)
--- a/
lnet/lnet/lib-md.c
+++ b/
lnet/lnet/lib-md.c
@@
-27,7
+27,7
@@
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2013,
Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-79,9
+79,9
@@
lnet_md_unlink(lnet_libmd_t *md)
(*md->md_eq->eq_refs[cpt])--;
}
(*md->md_eq->eq_refs[cpt])--;
}
- LASSERT(!
cfs_
list_empty(&md->md_list));
-
cfs_
list_del_init(&md->md_list);
- lnet_md_free
_locked
(md);
+ LASSERT(!list_empty(&md->md_list));
+ list_del_init(&md->md_list);
+ lnet_md_free(md);
}
static int
}
static int
@@
-127,9
+127,6
@@
lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink)
return -EINVAL;
} else if ((umd->options & LNET_MD_KIOV) != 0) {
return -EINVAL;
} else if ((umd->options & LNET_MD_KIOV) != 0) {
-#ifndef __KERNEL__
- return -EINVAL;
-#else
lmd->md_niov = niov = umd->length;
memcpy(lmd->md_iov.kiov, umd->start,
niov * sizeof (lmd->md_iov.kiov[0]));
lmd->md_niov = niov = umd->length;
memcpy(lmd->md_iov.kiov, umd->start,
niov * sizeof (lmd->md_iov.kiov[0]));
@@
-149,7
+146,6
@@
lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink)
(umd->max_size < 0 ||
umd->max_size > total_length)) // illegal max_size
return -EINVAL;
(umd->max_size < 0 ||
umd->max_size > total_length)) // illegal max_size
return -EINVAL;
-#endif
} else { /* contiguous */
lmd->md_length = umd->length;
lmd->md_niov = niov = 1;
} else { /* contiguous */
lmd->md_length = umd->length;
lmd->md_niov = niov = 1;
@@
-194,8
+190,8
@@
lnet_md_link(lnet_libmd_t *md, lnet_handle_eq_t eq_handle, int cpt)
lnet_res_lh_initialize(container, &md->md_lh);
lnet_res_lh_initialize(container, &md->md_lh);
- LASSERT(
cfs_
list_empty(&md->md_list));
-
cfs_
list_add(&md->md_list, &container->rec_active);
+ LASSERT(list_empty(&md->md_list));
+ list_add(&md->md_list, &container->rec_active);
return 0;
}
return 0;
}
@@
-219,7
+215,7
@@
lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd)
lnet_eq2handle(&umd->eq_handle, lmd->md_eq);
}
lnet_eq2handle(&umd->eq_handle, lmd->md_eq);
}
-int
+
static
int
lnet_md_validate(lnet_md_t *umd)
{
if (umd->start == NULL && umd->length != 0) {
lnet_md_validate(lnet_md_t *umd)
{
if (umd->start == NULL && umd->length != 0) {
@@
-267,14
+263,13
@@
int
LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd,
lnet_unlink_t unlink, lnet_handle_md_t *handle)
{
LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd,
lnet_unlink_t unlink, lnet_handle_md_t *handle)
{
-
CFS_LIST_HEAD
(matches);
-
CFS_LIST_HEAD
(drops);
+
struct list_head matches = LIST_HEAD_INIT
(matches);
+
struct list_head drops = LIST_HEAD_INIT
(drops);
struct lnet_me *me;
struct lnet_libmd *md;
int cpt;
int rc;
struct lnet_me *me;
struct lnet_libmd *md;
int cpt;
int rc;
- LASSERT (the_lnet.ln_init);
LASSERT (the_lnet.ln_refcount > 0);
if (lnet_md_validate(&umd) != 0)
LASSERT (the_lnet.ln_refcount > 0);
if (lnet_md_validate(&umd) != 0)
@@
-321,7
+316,7
@@
LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd,
return 0;
failed:
return 0;
failed:
- lnet_md_free
_locked
(md);
+ lnet_md_free(md);
lnet_res_unlock(cpt);
return rc;
lnet_res_unlock(cpt);
return rc;
@@
-351,7
+346,6
@@
LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle)
int cpt;
int rc;
int cpt;
int rc;
- LASSERT (the_lnet.ln_init);
LASSERT (the_lnet.ln_refcount > 0);
if (lnet_md_validate(&umd) != 0)
LASSERT (the_lnet.ln_refcount > 0);
if (lnet_md_validate(&umd) != 0)
@@
-382,7
+376,7
@@
LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle)
return 0;
failed:
return 0;
failed:
- lnet_md_free
_locked
(md);
+ lnet_md_free(md);
lnet_res_unlock(cpt);
return rc;
lnet_res_unlock(cpt);
return rc;
@@
-426,7
+420,6
@@
LNetMDUnlink (lnet_handle_md_t mdh)
lnet_libmd_t *md;
int cpt;
lnet_libmd_t *md;
int cpt;
- LASSERT(the_lnet.ln_init);
LASSERT(the_lnet.ln_refcount > 0);
cpt = lnet_cpt_of_cookie(mdh.cookie);
LASSERT(the_lnet.ln_refcount > 0);
cpt = lnet_cpt_of_cookie(mdh.cookie);