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-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
nodemap_storage.c
diff --git
a/lustre/ptlrpc/nodemap_storage.c
b/lustre/ptlrpc/nodemap_storage.c
index
33e6570
..
6951db0
100644
(file)
--- a/
lustre/ptlrpc/nodemap_storage.c
+++ b/
lustre/ptlrpc/nodemap_storage.c
@@
-87,9
+87,9
@@
static void nodemap_cluster_key_init(struct nodemap_key *nk, unsigned int nm_id)
static void nodemap_cluster_rec_init(union nodemap_rec *nr,
const struct lu_nodemap *nodemap)
{
static void nodemap_cluster_rec_init(union nodemap_rec *nr,
const struct lu_nodemap *nodemap)
{
-
CLASSERT(sizeof(nr->ncr.ncr_name) =
= sizeof(nodemap->nm_name));
+
BUILD_BUG_ON(sizeof(nr->ncr.ncr_name) !
= sizeof(nodemap->nm_name));
- strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(n
odemap->nm
_name));
+ strncpy(nr->ncr.ncr_name, nodemap->nm_name, sizeof(n
r->ncr.ncr
_name));
nr->ncr.ncr_squash_uid = cpu_to_le32(nodemap->nm_squash_uid);
nr->ncr.ncr_squash_gid = cpu_to_le32(nodemap->nm_squash_gid);
nr->ncr.ncr_flags = cpu_to_le32(
nr->ncr.ncr_squash_uid = cpu_to_le32(nodemap->nm_squash_uid);
nr->ncr.ncr_squash_gid = cpu_to_le32(nodemap->nm_squash_gid);
nr->ncr.ncr_flags = cpu_to_le32(
@@
-249,7
+249,7
@@
static int nodemap_idx_insert(const struct lu_env *env,
struct dt_device *dev = lu2dt_dev(idx->do_lu.lo_dev);
int rc;
struct dt_device *dev = lu2dt_dev(idx->do_lu.lo_dev);
int rc;
-
CLASSERT(sizeof(union nodemap_rec) =
= 32);
+
BUILD_BUG_ON(sizeof(union nodemap_rec) !
= 32);
th = dt_trans_create(env, dev);
th = dt_trans_create(env, dev);
@@
-671,7
+671,7
@@
static int nodemap_process_keyrec(struct nodemap_config *config,
ENTRY;
ENTRY;
-
CLASSERT(sizeof(union nodemap_rec) =
= 32);
+
BUILD_BUG_ON(sizeof(union nodemap_rec) !
= 32);
nodemap_id = le32_to_cpu(key->nk_nodemap_id);
type = nodemap_get_key_type(key);
nodemap_id = le32_to_cpu(key->nk_nodemap_id);
type = nodemap_get_key_type(key);
@@
-1460,12
+1460,12
@@
EXPORT_SYMBOL(nodemap_index_read);
int nodemap_get_config_req(struct obd_device *mgs_obd,
struct ptlrpc_request *req)
{
int nodemap_get_config_req(struct obd_device *mgs_obd,
struct ptlrpc_request *req)
{
+ const struct ptlrpc_bulk_frag_ops *frag_ops = &ptlrpc_bulk_kiov_pin_ops;
struct mgs_config_body *body;
struct mgs_config_res *res;
struct lu_rdpg rdpg;
struct idx_info nodemap_ii;
struct ptlrpc_bulk_desc *desc;
struct mgs_config_body *body;
struct mgs_config_res *res;
struct lu_rdpg rdpg;
struct idx_info nodemap_ii;
struct ptlrpc_bulk_desc *desc;
- struct l_wait_info lwi;
struct tg_export_data *rqexp_ted = &req->rq_export->exp_target_data;
int i;
int page_count;
struct tg_export_data *rqexp_ted = &req->rq_export->exp_target_data;
int i;
int page_count;
@@
-1523,18
+1523,17
@@
int nodemap_get_config_req(struct obd_device *mgs_obd,
desc = ptlrpc_prep_bulk_exp(req, page_count, 1,
PTLRPC_BULK_PUT_SOURCE |
PTLRPC_BULK_BUF_KIOV,
desc = ptlrpc_prep_bulk_exp(req, page_count, 1,
PTLRPC_BULK_PUT_SOURCE |
PTLRPC_BULK_BUF_KIOV,
- MGS_BULK_PORTAL,
- &ptlrpc_bulk_kiov_pin_ops);
+ MGS_BULK_PORTAL, frag_ops);
if (desc == NULL)
GOTO(out, rc = -ENOMEM);
for (i = 0; i < page_count && bytes > 0; i++) {
if (desc == NULL)
GOTO(out, rc = -ENOMEM);
for (i = 0; i < page_count && bytes > 0; i++) {
-
ptlrpc_prep_bulk_page_pin
(desc, rdpg.rp_pages[i], 0,
-
min_t(int, bytes, PAGE_SIZE));
+
frag_ops->add_kiov_frag
(desc, rdpg.rp_pages[i], 0,
+ min_t(int, bytes, PAGE_SIZE));
bytes -= PAGE_SIZE;
}
bytes -= PAGE_SIZE;
}
- rc = target_bulk_io(req->rq_export, desc
, &lwi
);
+ rc = target_bulk_io(req->rq_export, desc);
ptlrpc_free_bulk(desc);
out:
ptlrpc_free_bulk(desc);
out: