commit "[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct"
removed the last usage of rpriv (rpriv->flags) but forgot to remove
the unused rpriv struct resulting in:
drivers/scsi/libfc/fc_fcp.c: In function 'fc_queuecommand':
drivers/scsi/libfc/fc_fcp.c:1795:30: warning: variable 'rpriv' set
but not used [-Wunused-but-set-variable]
so simply drop its declaration and setting.
Patch was compile tested with x86_64_defconfig + SCSI_LOWLEVEL=y,
CONFIG_SCSI_FC_ATTRS=m, CONFIG_LIBFC=m
Patch is against 4.1-rc3 (localversion-next is -next-20150514)
Signed-off-by: Nicholas Mc Guire <[email protected]>
---
drivers/scsi/libfc/fc_fcp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index c438b81..fee6928 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1792,7 +1792,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
struct fc_lport *lport = shost_priv(shost);
struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
struct fc_fcp_pkt *fsp;
- struct fc_rport_libfc_priv *rpriv;
int rval;
int rc = 0;
struct fc_stats *stats;
@@ -1814,8 +1813,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
goto out;
}
- rpriv = rport->dd_data;
-
if (!fc_fcp_lport_queue_ready(lport)) {
if (lport->qfull)
fc_fcp_can_queue_ramp_down(lport);
--
1.7.10.4
On Thu, 2015-05-14 at 20:12 +0200, Nicholas Mc Guire wrote:
> commit "[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct"
> removed the last usage of rpriv (rpriv->flags) but forgot to remove
> the unused rpriv struct resulting in:
> drivers/scsi/libfc/fc_fcp.c: In function 'fc_queuecommand':
> drivers/scsi/libfc/fc_fcp.c:1795:30: warning: variable 'rpriv' set
> but not used [-Wunused-but-set-variable]
> so simply drop its declaration and setting.
>
> Patch was compile tested with x86_64_defconfig + SCSI_LOWLEVEL=y,
> CONFIG_SCSI_FC_ATTRS=m, CONFIG_LIBFC=m
>
> Patch is against 4.1-rc3 (localversion-next is -next-20150514)
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>
> ---
>
> drivers/scsi/libfc/fc_fcp.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
> index c438b81..fee6928 100644
> --- a/drivers/scsi/libfc/fc_fcp.c
> +++ b/drivers/scsi/libfc/fc_fcp.c
> @@ -1792,7 +1792,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
> struct fc_lport *lport = shost_priv(shost);
> struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
> struct fc_fcp_pkt *fsp;
> - struct fc_rport_libfc_priv *rpriv;
> int rval;
> int rc = 0;
> struct fc_stats *stats;
> @@ -1814,8 +1813,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
> goto out;
> }
>
> - rpriv = rport->dd_data;
> -
> if (!fc_fcp_lport_queue_ready(lport)) {
> if (lport->qfull)
> fc_fcp_can_queue_ramp_down(lport);
Looks good, Thx
Acked-by: Vasu Dev <[email protected]>
It seems like rpriv is used to set the fsp->tgt_flags originally
> fsp->tgt_flags = rpriv->flags
And fsp->tgt_flags are used in "fc_fcp_cmd_send" like this
setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp);
if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
fc_fcp_timer_set(fsp, get_fsp_rec_tov(fsp));
Main purpose of this flags used is to set the correct TimeOut Value for fc_fcp_timer.
So is the removal of the "fsp->tgt_flags = rpriv->flags" in fc_queuecommand() is intentional? Or by mistake?
Once we clear that out we can see whether this change make sense?
Thanks,
Prasad Gondi
-----Original Message-----
From: fcoe-devel [mailto:[email protected]] On Behalf Of Nicholas Mc Guire
Sent: Thursday, May 14, 2015 11:13 AM
To: Vasu Dev
Cc: [email protected]; James E.J. Bottomley; [email protected]; [email protected]; Nicholas Mc Guire
Subject: [Open-FCoE] [PATCH] scsi: fix Wunused-but-set-variable buildwarning
commit "[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct"
removed the last usage of rpriv (rpriv->flags) but forgot to remove the unused rpriv struct resulting in:
drivers/scsi/libfc/fc_fcp.c: In function 'fc_queuecommand':
drivers/scsi/libfc/fc_fcp.c:1795:30: warning: variable 'rpriv' set
but not used [-Wunused-but-set-variable] so simply drop its declaration and setting.
Patch was compile tested with x86_64_defconfig + SCSI_LOWLEVEL=y, CONFIG_SCSI_FC_ATTRS=m, CONFIG_LIBFC=m
Patch is against 4.1-rc3 (localversion-next is -next-20150514)
Signed-off-by: Nicholas Mc Guire <[email protected]>
---
drivers/scsi/libfc/fc_fcp.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index c438b81..fee6928 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -1792,7 +1792,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
struct fc_lport *lport = shost_priv(shost);
struct fc_rport *rport = starget_to_rport(scsi_target(sc_cmd->device));
struct fc_fcp_pkt *fsp;
- struct fc_rport_libfc_priv *rpriv;
int rval;
int rc = 0;
struct fc_stats *stats;
@@ -1814,8 +1813,6 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd)
goto out;
}
- rpriv = rport->dd_data;
-
if (!fc_fcp_lport_queue_ready(lport)) {
if (lport->qfull)
fc_fcp_can_queue_ramp_down(lport);
--
1.7.10.4
_______________________________________________
fcoe-devel mailing list
[email protected]
https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.open-2Dfcoe.org_mailman_listinfo_fcoe-2Ddevel&d=AwICAg&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=wjT-lROQxgFnmIgeyNof2ACTY91g4HqkQGUkJo2HQ0k&m=CyBs5yDLeN-k1LsnaCsHCdi06s2NEU0XemK8ry1EDg0&s=8x44EVd0jYu65AU-LSkgpi49VN9OIj9P6sDqg9AmLVo&e=
On Thu, 14 May 2015, Prasad Gondi wrote:
> It seems like rpriv is used to set the fsp->tgt_flags originally
>
> > fsp->tgt_flags = rpriv->flags
>
> And fsp->tgt_flags are used in "fc_fcp_cmd_send" like this
>
> setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp);
> if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
> fc_fcp_timer_set(fsp, get_fsp_rec_tov(fsp));
>
> Main purpose of this flags used is to set the correct TimeOut Value for fc_fcp_timer.
>
> So is the removal of the "fsp->tgt_flags = rpriv->flags" in fc_queuecommand() is intentional? Or by mistake?
>
thats something I can't say - but the commit message indicated that the
removal of tgt_flags was intentional.
> Once we clear that out we can see whether this change make sense?
>
yup - many thanks !
hofrat
On Fri, 2015-05-15 at 09:14 +0200, Nicholas Mc Guire wrote:
> On Thu, 14 May 2015, Prasad Gondi wrote:
>
> > It seems like rpriv is used to set the fsp->tgt_flags originally
> >
> > > fsp->tgt_flags = rpriv->flags
> >
> > And fsp->tgt_flags are used in "fc_fcp_cmd_send" like this
> >
> > setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp);
> > if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
> > fc_fcp_timer_set(fsp, get_fsp_rec_tov(fsp));
> >
> > Main purpose of this flags used is to set the correct TimeOut Value for fc_fcp_timer.
> >
> > So is the removal of the "fsp->tgt_flags = rpriv->flags" in fc_queuecommand() is intentional? Or by mistake?
> >
> thats something I can't say - but the commit message indicated that the
> removal of tgt_flags was intentional.
>
It was intentional and good cleanup since now rpriv->flags is used
directly with that change instead of storing in fsp->tgt_flags as it was
before.
> > Once we clear that out we can see whether this change make sense?
> >
Anycase the patch under discussion is straight forward clean up patch
since it just removes a local stack variable which is not used.
Thanks,
Vasu
Thanks Vasu for the details.
I agree current patch is good to go. I have no objections and it is an extension to the older patch which removed the " fsp->tgt_flags" flags.
Thanks,
Prasad
-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: Friday, May 15, 2015 10:10 AM
To: Nicholas Mc Guire
Cc: Prasad Gondi; [email protected]; James E.J. Bottomley; [email protected]; Nicholas Mc Guire; [email protected]
Subject: Re: [Open-FCoE] [PATCH] scsi: fix Wunused-but-set-variable buildwarning
On Fri, 2015-05-15 at 09:14 +0200, Nicholas Mc Guire wrote:
> On Thu, 14 May 2015, Prasad Gondi wrote:
>
> > It seems like rpriv is used to set the fsp->tgt_flags originally
> >
> > > fsp->tgt_flags = rpriv->flags
> >
> > And fsp->tgt_flags are used in "fc_fcp_cmd_send" like this
> >
> > setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp);
> > if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED)
> > fc_fcp_timer_set(fsp, get_fsp_rec_tov(fsp));
> >
> > Main purpose of this flags used is to set the correct TimeOut Value for fc_fcp_timer.
> >
> > So is the removal of the "fsp->tgt_flags = rpriv->flags" in fc_queuecommand() is intentional? Or by mistake?
> >
> thats something I can't say - but the commit message indicated that
> the removal of tgt_flags was intentional.
>
It was intentional and good cleanup since now rpriv->flags is used directly with that change instead of storing in fsp->tgt_flags as it was before.
> > Once we clear that out we can see whether this change make sense?
> >
Anycase the patch under discussion is straight forward clean up patch since it just removes a local stack variable which is not used.
Thanks,
Vasu
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?