mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
vhost-scsi: Make func indention more consistent
Signed-off-by: Asias He <asias@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Asias He
Michael S. Tsirkin
parent
c7289312fe
commit
683bd967dd
@ -328,11 +328,12 @@ static u32 tcm_vhost_get_default_depth(struct se_portal_group *se_tpg)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static u32 tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code,
|
||||
unsigned char *buf)
|
||||
static u32
|
||||
tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code,
|
||||
unsigned char *buf)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -358,10 +359,11 @@ static u32 tcm_vhost_get_pr_transport_id(struct se_portal_group *se_tpg,
|
||||
format_code, buf);
|
||||
}
|
||||
|
||||
static u32 tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code)
|
||||
static u32
|
||||
tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl,
|
||||
struct t10_pr_registration *pr_reg,
|
||||
int *format_code)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -387,10 +389,11 @@ static u32 tcm_vhost_get_pr_transport_id_len(struct se_portal_group *se_tpg,
|
||||
format_code);
|
||||
}
|
||||
|
||||
static char *tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
const char *buf,
|
||||
u32 *out_tid_len,
|
||||
char **port_nexus_ptr)
|
||||
static char *
|
||||
tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
const char *buf,
|
||||
u32 *out_tid_len,
|
||||
char **port_nexus_ptr)
|
||||
{
|
||||
struct tcm_vhost_tpg *tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -416,8 +419,8 @@ static char *tcm_vhost_parse_pr_out_transport_id(struct se_portal_group *se_tpg,
|
||||
port_nexus_ptr);
|
||||
}
|
||||
|
||||
static struct se_node_acl *tcm_vhost_alloc_fabric_acl(
|
||||
struct se_portal_group *se_tpg)
|
||||
static struct se_node_acl *
|
||||
tcm_vhost_alloc_fabric_acl(struct se_portal_group *se_tpg)
|
||||
{
|
||||
struct tcm_vhost_nacl *nacl;
|
||||
|
||||
@ -430,8 +433,9 @@ static struct se_node_acl *tcm_vhost_alloc_fabric_acl(
|
||||
return &nacl->se_node_acl;
|
||||
}
|
||||
|
||||
static void tcm_vhost_release_fabric_acl(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl)
|
||||
static void
|
||||
tcm_vhost_release_fabric_acl(struct se_portal_group *se_tpg,
|
||||
struct se_node_acl *se_nacl)
|
||||
{
|
||||
struct tcm_vhost_nacl *nacl = container_of(se_nacl,
|
||||
struct tcm_vhost_nacl, se_node_acl);
|
||||
@ -526,8 +530,9 @@ static void tcm_vhost_free_evt(struct vhost_scsi *vs, struct tcm_vhost_evt *evt)
|
||||
kfree(evt);
|
||||
}
|
||||
|
||||
static struct tcm_vhost_evt *tcm_vhost_allocate_evt(struct vhost_scsi *vs,
|
||||
u32 event, u32 reason)
|
||||
static struct tcm_vhost_evt *
|
||||
tcm_vhost_allocate_evt(struct vhost_scsi *vs,
|
||||
u32 event, u32 reason)
|
||||
{
|
||||
struct vhost_virtqueue *vq = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
struct tcm_vhost_evt *evt;
|
||||
@ -571,8 +576,8 @@ static void vhost_scsi_free_cmd(struct tcm_vhost_cmd *tv_cmd)
|
||||
kfree(tv_cmd);
|
||||
}
|
||||
|
||||
static void tcm_vhost_do_evt_work(struct vhost_scsi *vs,
|
||||
struct tcm_vhost_evt *evt)
|
||||
static void
|
||||
tcm_vhost_do_evt_work(struct vhost_scsi *vs, struct tcm_vhost_evt *evt)
|
||||
{
|
||||
struct vhost_virtqueue *vq = &vs->vqs[VHOST_SCSI_VQ_EVT].vq;
|
||||
struct virtio_scsi_event *event = &evt->event;
|
||||
@ -693,12 +698,12 @@ static void vhost_scsi_complete_cmd_work(struct vhost_work *work)
|
||||
vhost_signal(&vs->dev, &vs->vqs[vq].vq);
|
||||
}
|
||||
|
||||
static struct tcm_vhost_cmd *vhost_scsi_allocate_cmd(
|
||||
struct vhost_virtqueue *vq,
|
||||
struct tcm_vhost_tpg *tv_tpg,
|
||||
struct virtio_scsi_cmd_req *v_req,
|
||||
u32 exp_data_len,
|
||||
int data_direction)
|
||||
static struct tcm_vhost_cmd *
|
||||
vhost_scsi_allocate_cmd(struct vhost_virtqueue *vq,
|
||||
struct tcm_vhost_tpg *tv_tpg,
|
||||
struct virtio_scsi_cmd_req *v_req,
|
||||
u32 exp_data_len,
|
||||
int data_direction)
|
||||
{
|
||||
struct tcm_vhost_cmd *tv_cmd;
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
@ -729,8 +734,11 @@ static struct tcm_vhost_cmd *vhost_scsi_allocate_cmd(
|
||||
*
|
||||
* Returns the number of scatterlist entries used or -errno on error.
|
||||
*/
|
||||
static int vhost_scsi_map_to_sgl(struct scatterlist *sgl,
|
||||
unsigned int sgl_count, struct iovec *iov, int write)
|
||||
static int
|
||||
vhost_scsi_map_to_sgl(struct scatterlist *sgl,
|
||||
unsigned int sgl_count,
|
||||
struct iovec *iov,
|
||||
int write)
|
||||
{
|
||||
unsigned int npages = 0, pages_nr, offset, nbytes;
|
||||
struct scatterlist *sg = sgl;
|
||||
@ -774,8 +782,11 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
|
||||
struct iovec *iov, unsigned int niov, int write)
|
||||
static int
|
||||
vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
|
||||
struct iovec *iov,
|
||||
unsigned int niov,
|
||||
int write)
|
||||
{
|
||||
int ret;
|
||||
unsigned int i;
|
||||
@ -855,8 +866,10 @@ static void tcm_vhost_submission_work(struct work_struct *work)
|
||||
}
|
||||
}
|
||||
|
||||
static void vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq, int head, unsigned out)
|
||||
static void
|
||||
vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq,
|
||||
int head, unsigned out)
|
||||
{
|
||||
struct virtio_scsi_cmd_resp __user *resp;
|
||||
struct virtio_scsi_cmd_resp rsp;
|
||||
@ -872,8 +885,8 @@ static void vhost_scsi_send_bad_target(struct vhost_scsi *vs,
|
||||
pr_err("Faulted on virtio_scsi_cmd_resp\n");
|
||||
}
|
||||
|
||||
static void vhost_scsi_handle_vq(struct vhost_scsi *vs,
|
||||
struct vhost_virtqueue *vq)
|
||||
static void
|
||||
vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
|
||||
{
|
||||
struct tcm_vhost_tpg **vs_tpg;
|
||||
struct virtio_scsi_cmd_req v_req;
|
||||
@ -1054,8 +1067,12 @@ static void vhost_scsi_ctl_handle_kick(struct vhost_work *work)
|
||||
pr_debug("%s: The handling func for control queue.\n", __func__);
|
||||
}
|
||||
|
||||
static void tcm_vhost_send_evt(struct vhost_scsi *vs, struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, u32 event, u32 reason)
|
||||
static void
|
||||
tcm_vhost_send_evt(struct vhost_scsi *vs,
|
||||
struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun,
|
||||
u32 event,
|
||||
u32 reason)
|
||||
{
|
||||
struct tcm_vhost_evt *evt;
|
||||
|
||||
@ -1145,9 +1162,9 @@ static void vhost_scsi_flush(struct vhost_scsi *vs)
|
||||
* The lock nesting rule is:
|
||||
* tcm_vhost_mutex -> vs->dev.mutex -> tpg->tv_tpg_mutex -> vq->mutex
|
||||
*/
|
||||
static int vhost_scsi_set_endpoint(
|
||||
struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
static int
|
||||
vhost_scsi_set_endpoint(struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
{
|
||||
struct tcm_vhost_tport *tv_tport;
|
||||
struct tcm_vhost_tpg *tv_tpg;
|
||||
@ -1235,9 +1252,9 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int vhost_scsi_clear_endpoint(
|
||||
struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
static int
|
||||
vhost_scsi_clear_endpoint(struct vhost_scsi *vs,
|
||||
struct vhost_scsi_target *t)
|
||||
{
|
||||
struct tcm_vhost_tport *tv_tport;
|
||||
struct tcm_vhost_tpg *tv_tpg;
|
||||
@ -1397,8 +1414,10 @@ static int vhost_scsi_release(struct inode *inode, struct file *f)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static long vhost_scsi_ioctl(struct file *f, unsigned int ioctl,
|
||||
unsigned long arg)
|
||||
static long
|
||||
vhost_scsi_ioctl(struct file *f,
|
||||
unsigned int ioctl,
|
||||
unsigned long arg)
|
||||
{
|
||||
struct vhost_scsi *vs = f->private_data;
|
||||
struct vhost_scsi_target backend;
|
||||
@ -1514,8 +1533,9 @@ static char *tcm_vhost_dump_proto_id(struct tcm_vhost_tport *tport)
|
||||
return "Unknown";
|
||||
}
|
||||
|
||||
static void tcm_vhost_do_plug(struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, bool plug)
|
||||
static void
|
||||
tcm_vhost_do_plug(struct tcm_vhost_tpg *tpg,
|
||||
struct se_lun *lun, bool plug)
|
||||
{
|
||||
|
||||
struct vhost_scsi *vs = tpg->vhost_scsi;
|
||||
@ -1555,7 +1575,7 @@ static void tcm_vhost_hotunplug(struct tcm_vhost_tpg *tpg, struct se_lun *lun)
|
||||
}
|
||||
|
||||
static int tcm_vhost_port_link(struct se_portal_group *se_tpg,
|
||||
struct se_lun *lun)
|
||||
struct se_lun *lun)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -1574,7 +1594,7 @@ static int tcm_vhost_port_link(struct se_portal_group *se_tpg,
|
||||
}
|
||||
|
||||
static void tcm_vhost_port_unlink(struct se_portal_group *se_tpg,
|
||||
struct se_lun *lun)
|
||||
struct se_lun *lun)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -1590,10 +1610,10 @@ static void tcm_vhost_port_unlink(struct se_portal_group *se_tpg,
|
||||
mutex_unlock(&tcm_vhost_mutex);
|
||||
}
|
||||
|
||||
static struct se_node_acl *tcm_vhost_make_nodeacl(
|
||||
struct se_portal_group *se_tpg,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_node_acl *
|
||||
tcm_vhost_make_nodeacl(struct se_portal_group *se_tpg,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct se_node_acl *se_nacl, *se_nacl_new;
|
||||
struct tcm_vhost_nacl *nacl;
|
||||
@ -1635,7 +1655,7 @@ static void tcm_vhost_drop_nodeacl(struct se_node_acl *se_acl)
|
||||
}
|
||||
|
||||
static int tcm_vhost_make_nexus(struct tcm_vhost_tpg *tv_tpg,
|
||||
const char *name)
|
||||
const char *name)
|
||||
{
|
||||
struct se_portal_group *se_tpg;
|
||||
struct tcm_vhost_nexus *tv_nexus;
|
||||
@ -1739,7 +1759,7 @@ static int tcm_vhost_drop_nexus(struct tcm_vhost_tpg *tpg)
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_tpg_show_nexus(struct se_portal_group *se_tpg,
|
||||
char *page)
|
||||
char *page)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -1760,8 +1780,8 @@ static ssize_t tcm_vhost_tpg_show_nexus(struct se_portal_group *se_tpg,
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_tpg_store_nexus(struct se_portal_group *se_tpg,
|
||||
const char *page,
|
||||
size_t count)
|
||||
const char *page,
|
||||
size_t count)
|
||||
{
|
||||
struct tcm_vhost_tpg *tv_tpg = container_of(se_tpg,
|
||||
struct tcm_vhost_tpg, se_tpg);
|
||||
@ -1844,9 +1864,10 @@ static struct configfs_attribute *tcm_vhost_tpg_attrs[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static struct se_portal_group *tcm_vhost_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *
|
||||
tcm_vhost_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_vhost_tport *tport = container_of(wwn,
|
||||
struct tcm_vhost_tport, tport_wwn);
|
||||
@ -1902,9 +1923,10 @@ static void tcm_vhost_drop_tpg(struct se_portal_group *se_tpg)
|
||||
kfree(tpg);
|
||||
}
|
||||
|
||||
static struct se_wwn *tcm_vhost_make_tport(struct target_fabric_configfs *tf,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_wwn *
|
||||
tcm_vhost_make_tport(struct target_fabric_configfs *tf,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_vhost_tport *tport;
|
||||
char *ptr;
|
||||
@ -1974,9 +1996,9 @@ static void tcm_vhost_drop_tport(struct se_wwn *wwn)
|
||||
kfree(tport);
|
||||
}
|
||||
|
||||
static ssize_t tcm_vhost_wwn_show_attr_version(
|
||||
struct target_fabric_configfs *tf,
|
||||
char *page)
|
||||
static ssize_t
|
||||
tcm_vhost_wwn_show_attr_version(struct target_fabric_configfs *tf,
|
||||
char *page)
|
||||
{
|
||||
return sprintf(page, "TCM_VHOST fabric module %s on %s/%s"
|
||||
"on "UTS_RELEASE"\n", TCM_VHOST_VERSION, utsname()->sysname,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user