From: Douglas Gilbert <dgilbert@interlog.com>
To: Tomas Winkler <tomas.winkler@intel.com>,
"James E.J. Bottomley\"" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 2/4] scsi_debug: use SCSI_W_LUN_REPORT_LUNS instead of SAM2_WLUN_REPORT_LUNS;
Date: Mon, 23 Feb 2015 13:20:57 -0500 [thread overview]
Message-ID: <54EB6F89.1070308@interlog.com> (raw)
In-Reply-To: <1424298699-2581-3-git-send-email-tomas.winkler@intel.com>
On 15-02-18 05:31 PM, Tomas Winkler wrote:
> use SCSI_W_LUN_REPORT_LUNS from scsi.h instead of localy defined
> SAM2_WLUN_REPORT_LUNS
>
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
> ---
> drivers/scsi/scsi_debug.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
> index 14e73f27c27f..11774cd1741a 100644
> --- a/drivers/scsi/scsi_debug.c
> +++ b/drivers/scsi/scsi_debug.c
> @@ -204,7 +204,6 @@ static const char *scsi_debug_version_date = "20141022";
> /* If REPORT LUNS has luns >= 256 it can choose "flat space" (value 1)
> * or "peripheral device" addressing (value 0) */
> #define SAM2_LUN_ADDRESS_METHOD 0
> -#define SAM2_WLUN_REPORT_LUNS 0xc101
>
> /* SCSI_DEBUG_CANQUEUE is the maximum number of commands that can be queued
> * (for response) at one time. Can be reduced by max_queue option. Command
> @@ -701,7 +700,7 @@ static void sdebug_max_tgts_luns(void)
> else
> hpnt->max_id = scsi_debug_num_tgts;
> /* scsi_debug_max_luns; */
> - hpnt->max_lun = SAM2_WLUN_REPORT_LUNS;
> + hpnt->max_lun = SCSI_W_LUN_REPORT_LUNS;
> }
> spin_unlock(&sdebug_host_list_lock);
> }
> @@ -1291,7 +1290,7 @@ static int resp_inquiry(struct scsi_cmnd *scp, struct sdebug_dev_info *devip)
> arr = kzalloc(SDEBUG_MAX_INQ_ARR_SZ, GFP_ATOMIC);
> if (! arr)
> return DID_REQUEUE << 16;
> - have_wlun = (scp->device->lun == SAM2_WLUN_REPORT_LUNS);
> + have_wlun = (scp->device->lun == SCSI_W_LUN_REPORT_LUNS);
> if (have_wlun)
> pq_pdt = 0x1e; /* present, wlun */
> else if (scsi_debug_no_lun_0 && (0 == devip->lun))
> @@ -3371,8 +3370,8 @@ static int resp_report_luns(struct scsi_cmnd * scp,
> one_lun[i].scsi_lun[1] = lun & 0xff;
> }
> if (want_wlun) {
> - one_lun[i].scsi_lun[0] = (SAM2_WLUN_REPORT_LUNS >> 8) & 0xff;
> - one_lun[i].scsi_lun[1] = SAM2_WLUN_REPORT_LUNS & 0xff;
> + one_lun[i].scsi_lun[0] = (SCSI_W_LUN_REPORT_LUNS >> 8) & 0xff;
> + one_lun[i].scsi_lun[1] = SCSI_W_LUN_REPORT_LUNS & 0xff;
> i++;
> }
> alloc_len = (unsigned char *)(one_lun + i) - arr;
> @@ -5171,7 +5170,7 @@ scsi_debug_queuecommand(struct scsi_cmnd *scp)
> }
> sdev_printk(KERN_INFO, sdp, "%s: cmd %s\n", my_name, b);
> }
> - has_wlun_rl = (sdp->lun == SAM2_WLUN_REPORT_LUNS);
> + has_wlun_rl = (sdp->lun == SCSI_W_LUN_REPORT_LUNS);
> if ((sdp->lun >= scsi_debug_max_luns) && !has_wlun_rl)
> return schedule_resp(scp, NULL, errsts_no_connect, 0);
>
> @@ -5342,7 +5341,7 @@ static int sdebug_driver_probe(struct device * dev)
> hpnt->max_id = scsi_debug_num_tgts + 1;
> else
> hpnt->max_id = scsi_debug_num_tgts;
> - hpnt->max_lun = SAM2_WLUN_REPORT_LUNS; /* = scsi_debug_max_luns; */
> + hpnt->max_lun = SCSI_W_LUN_REPORT_LUNS; /* = scsi_debug_max_luns; */
>
> host_prot = 0;
>
>
next prev parent reply other threads:[~2015-02-23 18:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-18 22:31 [PATCH 0/4] scsi_debug cleanup Tomas Winkler
2015-02-18 22:31 ` [PATCH 1/4] scsi_debug: define pr_fmt() for consistent logging Tomas Winkler
2015-02-23 18:19 ` Douglas Gilbert
2015-02-18 22:31 ` [PATCH 2/4] scsi_debug: use SCSI_W_LUN_REPORT_LUNS instead of SAM2_WLUN_REPORT_LUNS; Tomas Winkler
2015-02-23 18:20 ` Douglas Gilbert [this message]
2015-02-18 22:31 ` [PATCH 3/4] scsi_debug: vfree is null safe so drop the check Tomas Winkler
2015-02-23 18:23 ` Douglas Gilbert
2015-02-18 22:31 ` [PATCH 4/4] scsi_debug: make dump_sector static Tomas Winkler
2015-02-23 18:23 ` Douglas Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54EB6F89.1070308@interlog.com \
--to=dgilbert@interlog.com \
--cc=JBottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=tomas.winkler@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox