Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two simple fixes: one for sparse warnings that were introduced by the
merge window conversion to blist_flags_t and the other to fix dropped
I/O during reset in aacraid"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: aacraid: Fix I/O drop during reset
scsi: core: Use blist_flags_t consistently
+21
-18
+1
drivers/scsi/aacraid/aacraid.h
+1
drivers/scsi/aacraid/aacraid.h
+1
-1
drivers/scsi/aacraid/linit.c
+1
-1
drivers/scsi/aacraid/linit.c
···
1037
1037
info = &aac->hba_map[bus][cid];
1038
1038
if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||
1039
1039
info->devtype != AAC_DEVTYPE_NATIVE_RAW) {
1040
-
fib->flags |= FIB_CONTEXT_FLAG_TIMED_OUT;
1040
+
fib->flags |= FIB_CONTEXT_FLAG_EH_RESET;
1041
1041
cmd->SCp.phase = AAC_OWNER_ERROR_HANDLER;
1042
1042
}
1043
1043
}
+2
-4
drivers/scsi/scsi_devinfo.c
+2
-4
drivers/scsi/scsi_devinfo.c
···
374
374
model, compatible);
375
375
376
376
if (strflags)
377
-
devinfo->flags = simple_strtoul(strflags, NULL, 0);
378
-
else
379
-
devinfo->flags = flags;
380
-
377
+
flags = (__force blist_flags_t)simple_strtoul(strflags, NULL, 0);
378
+
devinfo->flags = flags;
381
379
devinfo->compatible = compatible;
382
380
383
381
if (compatible)
+7
-6
drivers/scsi/scsi_scan.c
+7
-6
drivers/scsi/scsi_scan.c
···
770
770
* SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
771
771
**/
772
772
static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
773
-
int *bflags, int async)
773
+
blist_flags_t *bflags, int async)
774
774
{
775
775
int ret;
776
776
···
1049
1049
* - SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
1050
1050
**/
1051
1051
static int scsi_probe_and_add_lun(struct scsi_target *starget,
1052
-
u64 lun, int *bflagsp,
1052
+
u64 lun, blist_flags_t *bflagsp,
1053
1053
struct scsi_device **sdevp,
1054
1054
enum scsi_scan_mode rescan,
1055
1055
void *hostdata)
1056
1056
{
1057
1057
struct scsi_device *sdev;
1058
1058
unsigned char *result;
1059
-
int bflags, res = SCSI_SCAN_NO_RESPONSE, result_len = 256;
1059
+
blist_flags_t bflags;
1060
+
int res = SCSI_SCAN_NO_RESPONSE, result_len = 256;
1060
1061
struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
1061
1062
1062
1063
/*
···
1202
1201
* Modifies sdevscan->lun.
1203
1202
**/
1204
1203
static void scsi_sequential_lun_scan(struct scsi_target *starget,
1205
-
int bflags, int scsi_level,
1204
+
blist_flags_t bflags, int scsi_level,
1206
1205
enum scsi_scan_mode rescan)
1207
1206
{
1208
1207
uint max_dev_lun;
···
1293
1292
* 0: scan completed (or no memory, so further scanning is futile)
1294
1293
* 1: could not scan with REPORT LUN
1295
1294
**/
1296
-
static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
1295
+
static int scsi_report_lun_scan(struct scsi_target *starget, blist_flags_t bflags,
1297
1296
enum scsi_scan_mode rescan)
1298
1297
{
1299
1298
unsigned char scsi_cmd[MAX_COMMAND_SIZE];
···
1539
1538
unsigned int id, u64 lun, enum scsi_scan_mode rescan)
1540
1539
{
1541
1540
struct Scsi_Host *shost = dev_to_shost(parent);
1542
-
int bflags = 0;
1541
+
blist_flags_t bflags = 0;
1543
1542
int res;
1544
1543
struct scsi_target *starget;
1545
1544
+3
-2
drivers/scsi/scsi_sysfs.c
+3
-2
drivers/scsi/scsi_sysfs.c
···
967
967
}
968
968
static DEVICE_ATTR(wwid, S_IRUGO, sdev_show_wwid, NULL);
969
969
970
-
#define BLIST_FLAG_NAME(name) [ilog2(BLIST_##name)] = #name
970
+
#define BLIST_FLAG_NAME(name) \
971
+
[ilog2((__force unsigned int)BLIST_##name)] = #name
971
972
static const char *const sdev_bflags_name[] = {
972
973
#include "scsi_devinfo_tbl.c"
973
974
};
···
985
984
for (i = 0; i < sizeof(sdev->sdev_bflags) * BITS_PER_BYTE; i++) {
986
985
const char *name = NULL;
987
986
988
-
if (!(sdev->sdev_bflags & BIT(i)))
987
+
if (!(sdev->sdev_bflags & (__force blist_flags_t)BIT(i)))
989
988
continue;
990
989
if (i < ARRAY_SIZE(sdev_bflags_name) && sdev_bflags_name[i])
991
990
name = sdev_bflags_name[i];
+7
-5
drivers/scsi/scsi_transport_spi.c
+7
-5
drivers/scsi/scsi_transport_spi.c
···
50
50
51
51
/* Our blacklist flags */
52
52
enum {
53
-
SPI_BLIST_NOIUS = 0x1,
53
+
SPI_BLIST_NOIUS = (__force blist_flags_t)0x1,
54
54
};
55
55
56
56
/* blacklist table, modelled on scsi_devinfo.c */
57
57
static struct {
58
58
char *vendor;
59
59
char *model;
60
-
unsigned flags;
60
+
blist_flags_t flags;
61
61
} spi_static_device_list[] __initdata = {
62
62
{"HP", "Ultrium 3-SCSI", SPI_BLIST_NOIUS },
63
63
{"IBM", "ULTRIUM-TD3", SPI_BLIST_NOIUS },
···
221
221
{
222
222
struct scsi_device *sdev = to_scsi_device(dev);
223
223
struct scsi_target *starget = sdev->sdev_target;
224
-
unsigned bflags = scsi_get_device_flags_keyed(sdev, &sdev->inquiry[8],
225
-
&sdev->inquiry[16],
226
-
SCSI_DEVINFO_SPI);
224
+
blist_flags_t bflags;
225
+
226
+
bflags = scsi_get_device_flags_keyed(sdev, &sdev->inquiry[8],
227
+
&sdev->inquiry[16],
228
+
SCSI_DEVINFO_SPI);
227
229
228
230
/* Populate the target capability fields with the values
229
231
* gleaned from the device inquiry */