mirror of https://gitee.com/openkylin/linux.git
staging/lustre: Remove unnecessary space after a cast
This patch fixes all checkpatch occurences of "CHECK: No space is necessary after a cast" in Lustre code. Signed-off-by: Emoly Liu <emoly.liu@intel.com> Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d719d2ddd1
commit
9797fb0e25
|
@ -35,7 +35,7 @@
|
||||||
#define MAX_NUM_SHOW_ENTRIES 32
|
#define MAX_NUM_SHOW_ENTRIES 32
|
||||||
#define LNET_MAX_STR_LEN 128
|
#define LNET_MAX_STR_LEN 128
|
||||||
#define LNET_MAX_SHOW_NUM_CPT 128
|
#define LNET_MAX_SHOW_NUM_CPT 128
|
||||||
#define LNET_UNDEFINED_HOPS ((__u32) -1)
|
#define LNET_UNDEFINED_HOPS ((__u32)(-1))
|
||||||
|
|
||||||
struct lnet_ioctl_config_lnd_cmn_tunables {
|
struct lnet_ioctl_config_lnd_cmn_tunables {
|
||||||
__u32 lct_version;
|
__u32 lct_version;
|
||||||
|
|
|
@ -68,9 +68,9 @@ typedef __u64 lnet_nid_t;
|
||||||
typedef __u32 lnet_pid_t;
|
typedef __u32 lnet_pid_t;
|
||||||
|
|
||||||
/** wildcard NID that matches any end-point address */
|
/** wildcard NID that matches any end-point address */
|
||||||
#define LNET_NID_ANY ((lnet_nid_t) -1)
|
#define LNET_NID_ANY ((lnet_nid_t)(-1))
|
||||||
/** wildcard PID that matches any lnet_pid_t */
|
/** wildcard PID that matches any lnet_pid_t */
|
||||||
#define LNET_PID_ANY ((lnet_pid_t) -1)
|
#define LNET_PID_ANY ((lnet_pid_t)(-1))
|
||||||
|
|
||||||
#define LNET_PID_RESERVED 0xf0000000 /* reserved bits in PID */
|
#define LNET_PID_RESERVED 0xf0000000 /* reserved bits in PID */
|
||||||
#define LNET_PID_USERFLAG 0x80000000 /* set in userspace peers */
|
#define LNET_PID_USERFLAG 0x80000000 /* set in userspace peers */
|
||||||
|
|
|
@ -98,7 +98,7 @@ extern struct kib_tunables kiblnd_tunables;
|
||||||
#define IBLND_CREDIT_HIGHWATER_V1 7 /* V1 only : when eagerly to return credits */
|
#define IBLND_CREDIT_HIGHWATER_V1 7 /* V1 only : when eagerly to return credits */
|
||||||
|
|
||||||
#define IBLND_CREDITS_DEFAULT 8 /* default # of peer credits */
|
#define IBLND_CREDITS_DEFAULT 8 /* default # of peer credits */
|
||||||
#define IBLND_CREDITS_MAX ((typeof(((struct kib_msg *) 0)->ibm_credits)) - 1) /* Max # of peer credits */
|
#define IBLND_CREDITS_MAX ((typeof(((struct kib_msg *)0)->ibm_credits)) - 1) /* Max # of peer credits */
|
||||||
|
|
||||||
/* when eagerly to return credits */
|
/* when eagerly to return credits */
|
||||||
#define IBLND_CREDITS_HIGHWATER(t, v) ((v) == IBLND_MSG_VERSION_1 ? \
|
#define IBLND_CREDITS_HIGHWATER(t, v) ((v) == IBLND_MSG_VERSION_1 ? \
|
||||||
|
|
|
@ -1103,7 +1103,7 @@ kiblnd_init_rdma(struct kib_conn *conn, struct kib_tx *tx, int type,
|
||||||
|
|
||||||
wrknob = min(min(kiblnd_rd_frag_size(srcrd, srcidx),
|
wrknob = min(min(kiblnd_rd_frag_size(srcrd, srcidx),
|
||||||
kiblnd_rd_frag_size(dstrd, dstidx)),
|
kiblnd_rd_frag_size(dstrd, dstidx)),
|
||||||
(__u32) resid);
|
(__u32)resid);
|
||||||
|
|
||||||
sge = &tx->tx_sge[tx->tx_nwrq];
|
sge = &tx->tx_sge[tx->tx_nwrq];
|
||||||
sge->addr = kiblnd_rd_frag_addr(srcrd, srcidx);
|
sge->addr = kiblnd_rd_frag_addr(srcrd, srcidx);
|
||||||
|
|
|
@ -475,7 +475,7 @@ ksocknal_add_peer(lnet_ni_t *ni, lnet_process_id_t id, __u32 ipaddr, int port)
|
||||||
write_lock_bh(&ksocknal_data.ksnd_global_lock);
|
write_lock_bh(&ksocknal_data.ksnd_global_lock);
|
||||||
|
|
||||||
/* always called with a ref on ni, so shutdown can't have started */
|
/* always called with a ref on ni, so shutdown can't have started */
|
||||||
LASSERT(!((struct ksock_net *) ni->ni_data)->ksnn_shutdown);
|
LASSERT(!((struct ksock_net *)ni->ni_data)->ksnn_shutdown);
|
||||||
|
|
||||||
peer2 = ksocknal_find_peer_locked(ni, id);
|
peer2 = ksocknal_find_peer_locked(ni, id);
|
||||||
if (peer2) {
|
if (peer2) {
|
||||||
|
@ -1146,7 +1146,7 @@ ksocknal_create_conn(lnet_ni_t *ni, struct ksock_route *route,
|
||||||
write_lock_bh(global_lock);
|
write_lock_bh(global_lock);
|
||||||
|
|
||||||
/* called with a ref on ni, so shutdown can't have started */
|
/* called with a ref on ni, so shutdown can't have started */
|
||||||
LASSERT(!((struct ksock_net *) ni->ni_data)->ksnn_shutdown);
|
LASSERT(!((struct ksock_net *)ni->ni_data)->ksnn_shutdown);
|
||||||
|
|
||||||
peer2 = ksocknal_find_peer_locked(ni, peerid);
|
peer2 = ksocknal_find_peer_locked(ni, peerid);
|
||||||
if (!peer2) {
|
if (!peer2) {
|
||||||
|
|
|
@ -126,7 +126,7 @@ ksocknal_send_iov(struct ksock_conn *conn, struct ksock_tx *tx)
|
||||||
do {
|
do {
|
||||||
LASSERT(tx->tx_niov > 0);
|
LASSERT(tx->tx_niov > 0);
|
||||||
|
|
||||||
if (nob < (int) iov->iov_len) {
|
if (nob < (int)iov->iov_len) {
|
||||||
iov->iov_base = (void *)((char *)iov->iov_base + nob);
|
iov->iov_base = (void *)((char *)iov->iov_base + nob);
|
||||||
iov->iov_len -= nob;
|
iov->iov_len -= nob;
|
||||||
return rc;
|
return rc;
|
||||||
|
@ -326,7 +326,7 @@ ksocknal_recv_kiov(struct ksock_conn *conn)
|
||||||
do {
|
do {
|
||||||
LASSERT(conn->ksnc_rx_nkiov > 0);
|
LASSERT(conn->ksnc_rx_nkiov > 0);
|
||||||
|
|
||||||
if (nob < (int) kiov->kiov_len) {
|
if (nob < (int)kiov->kiov_len) {
|
||||||
kiov->kiov_offset += nob;
|
kiov->kiov_offset += nob;
|
||||||
kiov->kiov_len -= nob;
|
kiov->kiov_len -= nob;
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
|
|
|
@ -503,7 +503,7 @@ ksocknal_send_hello_v1(struct ksock_conn *conn, ksock_hello_msg_t *hello)
|
||||||
if (!hello->kshm_nips)
|
if (!hello->kshm_nips)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
for (i = 0; i < (int) hello->kshm_nips; i++)
|
for (i = 0; i < (int)hello->kshm_nips; i++)
|
||||||
hello->kshm_ips[i] = __cpu_to_le32(hello->kshm_ips[i]);
|
hello->kshm_ips[i] = __cpu_to_le32(hello->kshm_ips[i]);
|
||||||
|
|
||||||
rc = lnet_sock_write(sock, hello->kshm_ips,
|
rc = lnet_sock_write(sock, hello->kshm_ips,
|
||||||
|
@ -622,7 +622,7 @@ ksocknal_recv_hello_v1(struct ksock_conn *conn, ksock_hello_msg_t *hello,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < (int) hello->kshm_nips; i++) {
|
for (i = 0; i < (int)hello->kshm_nips; i++) {
|
||||||
hello->kshm_ips[i] = __le32_to_cpu(hello->kshm_ips[i]);
|
hello->kshm_ips[i] = __le32_to_cpu(hello->kshm_ips[i]);
|
||||||
|
|
||||||
if (!hello->kshm_ips[i]) {
|
if (!hello->kshm_ips[i]) {
|
||||||
|
@ -690,7 +690,7 @@ ksocknal_recv_hello_v2(struct ksock_conn *conn, ksock_hello_msg_t *hello, int ti
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < (int) hello->kshm_nips; i++) {
|
for (i = 0; i < (int)hello->kshm_nips; i++) {
|
||||||
if (conn->ksnc_flip)
|
if (conn->ksnc_flip)
|
||||||
__swab32s(&hello->kshm_ips[i]);
|
__swab32s(&hello->kshm_ips[i]);
|
||||||
|
|
||||||
|
|
|
@ -1673,7 +1673,7 @@ lnet_fill_ni_info(struct lnet_ni *ni, struct lnet_ioctl_config_data *config)
|
||||||
if (!ni || !config)
|
if (!ni || !config)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
net_config = (struct lnet_ioctl_net_config *) config->cfg_bulk;
|
net_config = (struct lnet_ioctl_net_config *)config->cfg_bulk;
|
||||||
if (!net_config)
|
if (!net_config)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -196,7 +196,7 @@ static int __init lnet_init(void)
|
||||||
* Have to schedule a separate thread to avoid deadlocking
|
* Have to schedule a separate thread to avoid deadlocking
|
||||||
* in modload
|
* in modload
|
||||||
*/
|
*/
|
||||||
(void) kthread_run(lnet_configure, NULL, "lnet_initd");
|
(void)kthread_run(lnet_configure, NULL, "lnet_initd");
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -217,13 +217,13 @@ enum sptlrpc_bulk_service {
|
||||||
|
|
||||||
#define SPTLRPC_FLVR_DEFAULT SPTLRPC_FLVR_NULL
|
#define SPTLRPC_FLVR_DEFAULT SPTLRPC_FLVR_NULL
|
||||||
|
|
||||||
#define SPTLRPC_FLVR_INVALID ((__u32) 0xFFFFFFFF)
|
#define SPTLRPC_FLVR_INVALID ((__u32)0xFFFFFFFF)
|
||||||
#define SPTLRPC_FLVR_ANY ((__u32) 0xFFF00000)
|
#define SPTLRPC_FLVR_ANY ((__u32)0xFFF00000)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* extract the useful part from wire flavor
|
* extract the useful part from wire flavor
|
||||||
*/
|
*/
|
||||||
#define WIRE_FLVR(wflvr) (((__u32) (wflvr)) & 0x000FFFFF)
|
#define WIRE_FLVR(wflvr) (((__u32)(wflvr)) & 0x000FFFFF)
|
||||||
|
|
||||||
/** @} flavor */
|
/** @} flavor */
|
||||||
|
|
||||||
|
|
|
@ -1413,7 +1413,7 @@ int ll_lov_setstripe_ea_info(struct inode *inode, struct dentry *dentry,
|
||||||
out:
|
out:
|
||||||
return rc;
|
return rc;
|
||||||
out_req_free:
|
out_req_free:
|
||||||
ptlrpc_req_finished((struct ptlrpc_request *) oit.d.lustre.it_data);
|
ptlrpc_req_finished((struct ptlrpc_request *)oit.d.lustre.it_data);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -560,7 +560,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
|
||||||
|
|
||||||
env = cl_env_get(&refcheck);
|
env = cl_env_get(&refcheck);
|
||||||
if (!IS_ERR(env)) {
|
if (!IS_ERR(env)) {
|
||||||
pos = *(loff_t *) v;
|
pos = *(loff_t *)v;
|
||||||
vvp_pgcache_id_unpack(pos, &id);
|
vvp_pgcache_id_unpack(pos, &id);
|
||||||
sbi = f->private;
|
sbi = f->private;
|
||||||
clob = vvp_pgcache_obj(env, &sbi->ll_cl->cd_lu_dev, &id);
|
clob = vvp_pgcache_obj(env, &sbi->ll_cl->cd_lu_dev, &id);
|
||||||
|
|
|
@ -1803,7 +1803,7 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
|
||||||
case IOC_OBD_STATFS: {
|
case IOC_OBD_STATFS: {
|
||||||
struct obd_statfs stat_buf = {0};
|
struct obd_statfs stat_buf = {0};
|
||||||
|
|
||||||
if (*((__u32 *) data->ioc_inlbuf2) != 0) {
|
if (*((__u32 *)data->ioc_inlbuf2) != 0) {
|
||||||
rc = -ENODEV;
|
rc = -ENODEV;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -1997,7 +1997,7 @@ static int mdc_hsm_copytool_send(int len, void *val)
|
||||||
|
|
||||||
if (len < sizeof(*lh) + sizeof(*hal)) {
|
if (len < sizeof(*lh) + sizeof(*hal)) {
|
||||||
CERROR("Short HSM message %d < %d\n", len,
|
CERROR("Short HSM message %d < %d\n", len,
|
||||||
(int) (sizeof(*lh) + sizeof(*hal)));
|
(int)(sizeof(*lh) + sizeof(*hal)));
|
||||||
return -EPROTO;
|
return -EPROTO;
|
||||||
}
|
}
|
||||||
if (lh->kuc_magic == __swab16(KUC_MAGIC)) {
|
if (lh->kuc_magic == __swab16(KUC_MAGIC)) {
|
||||||
|
|
|
@ -1030,7 +1030,7 @@ static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
|
||||||
rc = sptlrpc_parse_flavor(val, &flvr);
|
rc = sptlrpc_parse_flavor(val, &flvr);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
CERROR("invalid sptlrpc flavor %s to MGS\n",
|
CERROR("invalid sptlrpc flavor %s to MGS\n",
|
||||||
(char *) val);
|
(char *)val);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1046,7 +1046,7 @@ static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
|
||||||
sptlrpc_flavor2name(&cli->cl_flvr_mgc,
|
sptlrpc_flavor2name(&cli->cl_flvr_mgc,
|
||||||
str, sizeof(str));
|
str, sizeof(str));
|
||||||
LCONSOLE_ERROR("asking sptlrpc flavor %s to MGS but currently %s is in use\n",
|
LCONSOLE_ERROR("asking sptlrpc flavor %s to MGS but currently %s is in use\n",
|
||||||
(char *) val, str);
|
(char *)val, str);
|
||||||
rc = -EPERM;
|
rc = -EPERM;
|
||||||
}
|
}
|
||||||
return rc;
|
return rc;
|
||||||
|
|
|
@ -573,7 +573,7 @@ static inline struct cl_env *cl_env_fetch(void)
|
||||||
{
|
{
|
||||||
struct cl_env *cle;
|
struct cl_env *cle;
|
||||||
|
|
||||||
cle = cfs_hash_lookup(cl_env_hash, (void *) (long) current->pid);
|
cle = cfs_hash_lookup(cl_env_hash, (void *)(long)current->pid);
|
||||||
LASSERT(ergo(cle, cle->ce_magic == &cl_env_init0));
|
LASSERT(ergo(cle, cle->ce_magic == &cl_env_init0));
|
||||||
return cle;
|
return cle;
|
||||||
}
|
}
|
||||||
|
@ -584,7 +584,7 @@ static inline void cl_env_attach(struct cl_env *cle)
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
LASSERT(!cle->ce_owner);
|
LASSERT(!cle->ce_owner);
|
||||||
cle->ce_owner = (void *) (long) current->pid;
|
cle->ce_owner = (void *)(long)current->pid;
|
||||||
rc = cfs_hash_add_unique(cl_env_hash, cle->ce_owner,
|
rc = cfs_hash_add_unique(cl_env_hash, cle->ce_owner,
|
||||||
&cle->ce_node);
|
&cle->ce_node);
|
||||||
LASSERT(rc == 0);
|
LASSERT(rc == 0);
|
||||||
|
@ -595,7 +595,7 @@ static inline void cl_env_do_detach(struct cl_env *cle)
|
||||||
{
|
{
|
||||||
void *cookie;
|
void *cookie;
|
||||||
|
|
||||||
LASSERT(cle->ce_owner == (void *) (long) current->pid);
|
LASSERT(cle->ce_owner == (void *)(long)current->pid);
|
||||||
cookie = cfs_hash_del(cl_env_hash, cle->ce_owner,
|
cookie = cfs_hash_del(cl_env_hash, cle->ce_owner,
|
||||||
&cle->ce_node);
|
&cle->ce_node);
|
||||||
LASSERT(cookie == cle);
|
LASSERT(cookie == cle);
|
||||||
|
|
|
@ -1073,7 +1073,7 @@ int class_config_llog_handler(const struct lu_env *env,
|
||||||
{
|
{
|
||||||
struct config_llog_instance *clli = data;
|
struct config_llog_instance *clli = data;
|
||||||
int cfg_len = rec->lrh_len;
|
int cfg_len = rec->lrh_len;
|
||||||
char *cfg_buf = (char *) (rec + 1);
|
char *cfg_buf = (char *)(rec + 1);
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
switch (rec->lrh_type) {
|
switch (rec->lrh_type) {
|
||||||
|
|
|
@ -769,7 +769,7 @@ static int nrs_policy_register(struct ptlrpc_nrs *nrs,
|
||||||
spin_unlock(&nrs->nrs_lock);
|
spin_unlock(&nrs->nrs_lock);
|
||||||
|
|
||||||
if (rc != 0)
|
if (rc != 0)
|
||||||
(void) nrs_policy_unregister(nrs, policy->pol_desc->pd_name);
|
(void)nrs_policy_unregister(nrs, policy->pol_desc->pd_name);
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1100,7 +1100,7 @@ int sptlrpc_cli_unwrap_early_reply(struct ptlrpc_request *req,
|
||||||
early_req->rq_flvr = req->rq_flvr;
|
early_req->rq_flvr = req->rq_flvr;
|
||||||
early_req->rq_repbuf = early_buf;
|
early_req->rq_repbuf = early_buf;
|
||||||
early_req->rq_repbuf_len = early_bufsz;
|
early_req->rq_repbuf_len = early_bufsz;
|
||||||
early_req->rq_repdata = (struct lustre_msg *) early_buf;
|
early_req->rq_repdata = (struct lustre_msg *)early_buf;
|
||||||
early_req->rq_repdata_len = early_size;
|
early_req->rq_repdata_len = early_size;
|
||||||
early_req->rq_early = 1;
|
early_req->rq_early = 1;
|
||||||
early_req->rq_reqmsg = req->rq_reqmsg;
|
early_req->rq_reqmsg = req->rq_reqmsg;
|
||||||
|
@ -1552,7 +1552,7 @@ void _sptlrpc_enlarge_msg_inplace(struct lustre_msg *msg,
|
||||||
/* move from segment + 1 to end segment */
|
/* move from segment + 1 to end segment */
|
||||||
LASSERT(msg->lm_magic == LUSTRE_MSG_MAGIC_V2);
|
LASSERT(msg->lm_magic == LUSTRE_MSG_MAGIC_V2);
|
||||||
oldmsg_size = lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens);
|
oldmsg_size = lustre_msg_size_v2(msg->lm_bufcount, msg->lm_buflens);
|
||||||
movesize = oldmsg_size - ((unsigned long) src - (unsigned long) msg);
|
movesize = oldmsg_size - ((unsigned long)src - (unsigned long)msg);
|
||||||
LASSERT(movesize >= 0);
|
LASSERT(movesize >= 0);
|
||||||
|
|
||||||
if (movesize)
|
if (movesize)
|
||||||
|
|
|
@ -269,7 +269,7 @@ static unsigned long enc_pools_shrink_scan(struct shrinker *s,
|
||||||
static inline
|
static inline
|
||||||
int npages_to_npools(unsigned long npages)
|
int npages_to_npools(unsigned long npages)
|
||||||
{
|
{
|
||||||
return (int) ((npages + PAGES_PER_POOL - 1) / PAGES_PER_POOL);
|
return (int)((npages + PAGES_PER_POOL - 1) / PAGES_PER_POOL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -644,7 +644,7 @@ static int logname2fsname(const char *logname, char *buf, int buflen)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
len = min((int) (ptr - logname), buflen - 1);
|
len = min((int)(ptr - logname), buflen - 1);
|
||||||
|
|
||||||
memcpy(buf, logname, len);
|
memcpy(buf, logname, len);
|
||||||
buf[len] = '\0';
|
buf[len] = '\0';
|
||||||
|
|
|
@ -56,7 +56,7 @@ static struct ptlrpc_svc_ctx null_svc_ctx;
|
||||||
static inline
|
static inline
|
||||||
void null_encode_sec_part(struct lustre_msg *msg, enum lustre_sec_part sp)
|
void null_encode_sec_part(struct lustre_msg *msg, enum lustre_sec_part sp)
|
||||||
{
|
{
|
||||||
msg->lm_secflvr |= (((__u32) sp) & 0xFF) << 24;
|
msg->lm_secflvr |= (((__u32)sp) & 0xFF) << 24;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
|
@ -326,7 +326,7 @@ int null_alloc_rs(struct ptlrpc_request *req, int msgsize)
|
||||||
rs->rs_svc_ctx = req->rq_svc_ctx;
|
rs->rs_svc_ctx = req->rq_svc_ctx;
|
||||||
atomic_inc(&req->rq_svc_ctx->sc_refcount);
|
atomic_inc(&req->rq_svc_ctx->sc_refcount);
|
||||||
|
|
||||||
rs->rs_repbuf = (struct lustre_msg *) (rs + 1);
|
rs->rs_repbuf = (struct lustre_msg *)(rs + 1);
|
||||||
rs->rs_repbuf_len = rs_size - sizeof(*rs);
|
rs->rs_repbuf_len = rs_size - sizeof(*rs);
|
||||||
rs->rs_msg = rs->rs_repbuf;
|
rs->rs_msg = rs->rs_repbuf;
|
||||||
|
|
||||||
|
|
|
@ -294,7 +294,7 @@ int plain_cli_wrap_bulk(struct ptlrpc_cli_ctx *ctx,
|
||||||
LASSERT(req->rq_reqbuf->lm_bufcount == PLAIN_PACK_SEGMENTS);
|
LASSERT(req->rq_reqbuf->lm_bufcount == PLAIN_PACK_SEGMENTS);
|
||||||
|
|
||||||
bsd = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
bsd = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
||||||
token = (struct plain_bulk_token *) bsd->bsd_data;
|
token = (struct plain_bulk_token *)bsd->bsd_data;
|
||||||
|
|
||||||
bsd->bsd_version = 0;
|
bsd->bsd_version = 0;
|
||||||
bsd->bsd_flags = 0;
|
bsd->bsd_flags = 0;
|
||||||
|
@ -339,7 +339,7 @@ int plain_cli_unwrap_bulk(struct ptlrpc_cli_ctx *ctx,
|
||||||
LASSERT(req->rq_repdata->lm_bufcount == PLAIN_PACK_SEGMENTS);
|
LASSERT(req->rq_repdata->lm_bufcount == PLAIN_PACK_SEGMENTS);
|
||||||
|
|
||||||
bsdv = lustre_msg_buf(req->rq_repdata, PLAIN_PACK_BULK_OFF, 0);
|
bsdv = lustre_msg_buf(req->rq_repdata, PLAIN_PACK_BULK_OFF, 0);
|
||||||
tokenv = (struct plain_bulk_token *) bsdv->bsd_data;
|
tokenv = (struct plain_bulk_token *)bsdv->bsd_data;
|
||||||
|
|
||||||
if (req->rq_bulk_write) {
|
if (req->rq_bulk_write) {
|
||||||
if (bsdv->bsd_flags & BSD_FL_ERR)
|
if (bsdv->bsd_flags & BSD_FL_ERR)
|
||||||
|
@ -811,7 +811,7 @@ int plain_alloc_rs(struct ptlrpc_request *req, int msgsize)
|
||||||
|
|
||||||
rs->rs_svc_ctx = req->rq_svc_ctx;
|
rs->rs_svc_ctx = req->rq_svc_ctx;
|
||||||
atomic_inc(&req->rq_svc_ctx->sc_refcount);
|
atomic_inc(&req->rq_svc_ctx->sc_refcount);
|
||||||
rs->rs_repbuf = (struct lustre_msg *) (rs + 1);
|
rs->rs_repbuf = (struct lustre_msg *)(rs + 1);
|
||||||
rs->rs_repbuf_len = rs_size - sizeof(*rs);
|
rs->rs_repbuf_len = rs_size - sizeof(*rs);
|
||||||
|
|
||||||
lustre_init_msg_v2(rs->rs_repbuf, PLAIN_PACK_SEGMENTS, buflens, NULL);
|
lustre_init_msg_v2(rs->rs_repbuf, PLAIN_PACK_SEGMENTS, buflens, NULL);
|
||||||
|
@ -891,7 +891,7 @@ int plain_svc_unwrap_bulk(struct ptlrpc_request *req,
|
||||||
LASSERT(req->rq_pack_bulk);
|
LASSERT(req->rq_pack_bulk);
|
||||||
|
|
||||||
bsdr = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
bsdr = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
||||||
tokenr = (struct plain_bulk_token *) bsdr->bsd_data;
|
tokenr = (struct plain_bulk_token *)bsdr->bsd_data;
|
||||||
bsdv = lustre_msg_buf(rs->rs_repbuf, PLAIN_PACK_BULK_OFF, 0);
|
bsdv = lustre_msg_buf(rs->rs_repbuf, PLAIN_PACK_BULK_OFF, 0);
|
||||||
|
|
||||||
bsdv->bsd_version = 0;
|
bsdv->bsd_version = 0;
|
||||||
|
@ -926,7 +926,7 @@ int plain_svc_wrap_bulk(struct ptlrpc_request *req,
|
||||||
|
|
||||||
bsdr = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
bsdr = lustre_msg_buf(req->rq_reqbuf, PLAIN_PACK_BULK_OFF, 0);
|
||||||
bsdv = lustre_msg_buf(rs->rs_repbuf, PLAIN_PACK_BULK_OFF, 0);
|
bsdv = lustre_msg_buf(rs->rs_repbuf, PLAIN_PACK_BULK_OFF, 0);
|
||||||
tokenv = (struct plain_bulk_token *) bsdv->bsd_data;
|
tokenv = (struct plain_bulk_token *)bsdv->bsd_data;
|
||||||
|
|
||||||
bsdv->bsd_version = 0;
|
bsdv->bsd_version = 0;
|
||||||
bsdv->bsd_type = SPTLRPC_BULK_DEFAULT;
|
bsdv->bsd_type = SPTLRPC_BULK_DEFAULT;
|
||||||
|
|
Loading…
Reference in New Issue