mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-14 09:11:27 +00:00
fcst: Fix multiple checkpatch warnings
This patch does not change any functionality.
This commit is contained in:
@@ -213,9 +213,10 @@ int ft_send_response(struct scst_cmd *cmd)
|
||||
scst_cmd_get_resp_data_len(cmd);
|
||||
if (bi_resid)
|
||||
len += sizeof(__be32);
|
||||
} else
|
||||
} else {
|
||||
resid = (signed int)scst_cmd_get_bufflen(cmd) -
|
||||
scst_cmd_get_resp_data_len(cmd);
|
||||
}
|
||||
}
|
||||
|
||||
fp = fc_frame_alloc(lport, len);
|
||||
@@ -237,16 +238,18 @@ int ft_send_response(struct scst_cmd *cmd)
|
||||
if (bi_resid < 0) {
|
||||
fcp->resp.fr_flags |= FCP_BIDI_READ_OVER;
|
||||
bi_resid = -bi_resid;
|
||||
} else
|
||||
} else {
|
||||
fcp->resp.fr_flags |= FCP_BIDI_READ_UNDER;
|
||||
}
|
||||
*(__be32 *)((u8 *)(fcp + 1) + slen) = htonl(bi_resid);
|
||||
}
|
||||
if (resid) {
|
||||
if (resid < 0) {
|
||||
resid = -resid;
|
||||
fcp->resp.fr_flags |= FCP_RESID_OVER;
|
||||
} else
|
||||
} else {
|
||||
fcp->resp.fr_flags |= FCP_RESID_UNDER;
|
||||
}
|
||||
fcp->ext.fr_resid = htonl(resid);
|
||||
}
|
||||
FT_IO_DBG("response did %x oxid %x\n", ep->did, ep->oxid);
|
||||
@@ -285,7 +288,6 @@ err:
|
||||
"%s: invalid error code %d\n",
|
||||
__func__, error);
|
||||
return error;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -81,7 +81,7 @@ int ft_send_read_data(struct scst_cmd *cmd)
|
||||
return SCST_TGT_RES_SUCCESS;
|
||||
}
|
||||
FT_IO_DBG("sid %x oxid %x mem_len %zd frame_off %u remaining %zd\n",
|
||||
ep->sid, ep->oxid, mem_len, frame_off, remaining);
|
||||
ep->sid, ep->oxid, mem_len, frame_off, remaining);
|
||||
|
||||
/*
|
||||
* If we've already transferred some of the data, skip through
|
||||
@@ -99,12 +99,13 @@ int ft_send_read_data(struct scst_cmd *cmd)
|
||||
}
|
||||
mem_len -= tlen;
|
||||
mem_off = tlen;
|
||||
} else
|
||||
} else {
|
||||
#ifdef NEW_LIBFC_API
|
||||
fcmd->seq = fc_seq_start_next(fcmd->seq);
|
||||
#else
|
||||
fcmd->seq = lport->tt.seq_start_next(fcmd->seq);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* no scatter/gather in skb for odd word length due to fc_seq_send() */
|
||||
use_sg = !(remaining % 4) && lport->sg_supp;
|
||||
@@ -202,8 +203,9 @@ int ft_send_read_data(struct scst_cmd *cmd)
|
||||
"retrying" : "giving up");
|
||||
return error == -ENOMEM ? SCST_TGT_RES_QUEUE_FULL :
|
||||
SCST_TGT_RES_FATAL_ERROR;
|
||||
} else
|
||||
} else {
|
||||
fcmd->read_data_len = frame_off;
|
||||
}
|
||||
}
|
||||
if (mem_len)
|
||||
scst_put_buf(cmd, from);
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "fcst.h"
|
||||
|
||||
unsigned int ft_debug_logging;
|
||||
module_param_named(debug_logging, ft_debug_logging, int, S_IRUGO | S_IWUSR);
|
||||
module_param_named(debug_logging, ft_debug_logging, int, 0644);
|
||||
MODULE_PARM_DESC(debug_logging, "log levels bigmask");
|
||||
|
||||
DEFINE_MUTEX(ft_lport_lock);
|
||||
|
||||
@@ -301,8 +301,7 @@ static void ft_sess_close(struct ft_sess *sess)
|
||||
/*
|
||||
* Allocate and fill in the SPC Transport ID for persistent reservations.
|
||||
*/
|
||||
int ft_get_transport_id(struct scst_tgt *tgt, struct scst_session *scst_sess,
|
||||
uint8_t **result)
|
||||
int ft_get_transport_id(struct scst_tgt *tgt, struct scst_session *scst_sess, uint8_t **result)
|
||||
{
|
||||
struct ft_sess *sess;
|
||||
struct {
|
||||
@@ -413,7 +412,7 @@ static int ft_prli(struct fc_rport_priv *rdata, u32 spp_len,
|
||||
ret = ft_prli_locked(rdata, spp_len, rspp, spp);
|
||||
mutex_unlock(&ft_lport_lock);
|
||||
FT_SESS_DBG("port_id %x flags %x ret %x\n",
|
||||
rdata->ids.port_id, rspp ? rspp->spp_flags : 0, ret);
|
||||
rdata->ids.port_id, rspp ? rspp->spp_flags : 0, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -486,7 +485,7 @@ static void ft_recv(struct fc_lport *lport, struct fc_frame *fp)
|
||||
return;
|
||||
}
|
||||
FT_SESS_DBG("sid %x sess lookup returned %p preempt %x\n",
|
||||
sid, sess, preempt_count());
|
||||
sid, sess, preempt_count());
|
||||
ft_recv_req(sess, fp);
|
||||
ft_sess_put(sess);
|
||||
}
|
||||
@@ -523,7 +522,7 @@ int ft_tgt_enable(struct scst_tgt *tgt, bool enable)
|
||||
if (enable) {
|
||||
FT_SESS_DBG("enable tgt %s\n", tgt->tgt_name);
|
||||
tport = scst_tgt_get_tgt_priv(tgt);
|
||||
if (tport == NULL) {
|
||||
if (!tport) {
|
||||
ret = -E_TGT_PRIV_NOT_YET_SET;
|
||||
goto out;
|
||||
}
|
||||
@@ -542,7 +541,7 @@ bool ft_tgt_enabled(struct scst_tgt *tgt)
|
||||
{
|
||||
struct ft_tport *tport;
|
||||
|
||||
if (tgt == NULL)
|
||||
if (!tgt)
|
||||
return false;
|
||||
|
||||
tport = scst_tgt_get_tgt_priv(tgt);
|
||||
|
||||
Reference in New Issue
Block a user