| Message ID | 20221122181105.4123935-1-haowenchao@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi:iscsi: rename iscsi_set_param to iscsi_if_set_param | expand |
On 11/22/22 12:11 PM, Wenchao Hao wrote: > There are two iscsi_set_param() functions individually defined > in libiscsi.c and scsi_transport_iscsi.c which is confused. > > So rename the one in scsi_transport_iscsi.c to iscsi_if_set_param(). > > Signed-off-by: Wenchao Hao <haowenchao@huawei.com> > --- > drivers/scsi/scsi_transport_iscsi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c > index cd3db9684e52..c3fe5ecfee59 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -2988,7 +2988,7 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev > } > > static int > -iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) > +iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) > { > char *data = (char*)ev + sizeof(*ev); > struct iscsi_cls_conn *conn; > @@ -3941,7 +3941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) > err = -EINVAL; > break; > case ISCSI_UEVENT_SET_PARAM: > - err = iscsi_set_param(transport, ev); > + err = iscsi_if_set_param(transport, ev); > break; > case ISCSI_UEVENT_CREATE_CONN: > case ISCSI_UEVENT_DESTROY_CONN: Reviewed-by: Mike Christie <michael.christie@oracle.com>
On 11/22/22 10:11, Wenchao Hao wrote: > There are two iscsi_set_param() functions individually defined > in libiscsi.c and scsi_transport_iscsi.c which is confused. > > So rename the one in scsi_transport_iscsi.c to iscsi_if_set_param(). > > Signed-off-by: Wenchao Hao <haowenchao@huawei.com> > --- > drivers/scsi/scsi_transport_iscsi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c > index cd3db9684e52..c3fe5ecfee59 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -2988,7 +2988,7 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev > } > > static int > -iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) > +iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) > { > char *data = (char*)ev + sizeof(*ev); > struct iscsi_cls_conn *conn; > @@ -3941,7 +3941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) > err = -EINVAL; > break; > case ISCSI_UEVENT_SET_PARAM: > - err = iscsi_set_param(transport, ev); > + err = iscsi_if_set_param(transport, ev); > break; > case ISCSI_UEVENT_CREATE_CONN: > case ISCSI_UEVENT_DESTROY_CONN: Reviewed-by: Lee Duncan <lduncan@suse.com>
Wenchao, > There are two iscsi_set_param() functions individually defined in > libiscsi.c and scsi_transport_iscsi.c which is confused. Applied to 6.2/scsi-staging, thanks!
On Tue, 22 Nov 2022 18:11:05 +0000, Wenchao Hao wrote: > There are two iscsi_set_param() functions individually defined > in libiscsi.c and scsi_transport_iscsi.c which is confused. > > So rename the one in scsi_transport_iscsi.c to iscsi_if_set_param(). > > Applied to 6.2/scsi-queue, thanks! [1/1] scsi:iscsi: rename iscsi_set_param to iscsi_if_set_param https://git.kernel.org/mkp/scsi/c/0c26a2d7c980
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index cd3db9684e52..c3fe5ecfee59 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -2988,7 +2988,7 @@ iscsi_if_destroy_conn(struct iscsi_transport *transport, struct iscsi_uevent *ev } static int -iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) +iscsi_if_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev) { char *data = (char*)ev + sizeof(*ev); struct iscsi_cls_conn *conn; @@ -3941,7 +3941,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, uint32_t *group) err = -EINVAL; break; case ISCSI_UEVENT_SET_PARAM: - err = iscsi_set_param(transport, ev); + err = iscsi_if_set_param(transport, ev); break; case ISCSI_UEVENT_CREATE_CONN: case ISCSI_UEVENT_DESTROY_CONN:
There are two iscsi_set_param() functions individually defined in libiscsi.c and scsi_transport_iscsi.c which is confused. So rename the one in scsi_transport_iscsi.c to iscsi_if_set_param(). Signed-off-by: Wenchao Hao <haowenchao@huawei.com> --- drivers/scsi/scsi_transport_iscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)