Skip to content

Commit 89a93f2

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits) [SCSI] scsi_dh: fix kconfig related build errors [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h [SCSI] make struct scsi_{host,target}_type static [SCSI] fix locking in host use of blk_plug_device() [SCSI] zfcp: Cleanup external header file [SCSI] zfcp: Cleanup code in zfcp_erp.c [SCSI] zfcp: zfcp_fsf cleanup. [SCSI] zfcp: consolidate sysfs things into one file. [SCSI] zfcp: Cleanup of code in zfcp_aux.c [SCSI] zfcp: Cleanup of code in zfcp_scsi.c [SCSI] zfcp: Move status accessors from zfcp to SCSI include file. [SCSI] zfcp: Small QDIO cleanups [SCSI] zfcp: Adapter reopen for large number of unsolicited status [SCSI] zfcp: Fix error checking for ELS ADISC requests [SCSI] zfcp: wait until adapter is finished with ERP during auto-port [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver [SCSI] sg: Add target reset support [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC [SCSI] sd: Move scsi_disk() accessor function to sd.h ...
2 parents 260eddf + fe9233f commit 89a93f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+14467
-14257
lines changed

‎Documentation/scsi/aacraid.txt

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,33 @@ Supported Cards/Chipsets
5656
9005:0285:9005:02d1 Adaptec 5405 (Voodoo40)
5757
9005:0285:15d9:02d2 SMC AOC-USAS-S8i-LP
5858
9005:0285:15d9:02d3 SMC AOC-USAS-S8iR-LP
59-
9005:0285:9005:02d4 Adaptec 2045 (Voodoo04 Lite)
60-
9005:0285:9005:02d5 Adaptec 2405 (Voodoo40 Lite)
61-
9005:0285:9005:02d6 Adaptec 2445 (Voodoo44 Lite)
62-
9005:0285:9005:02d7 Adaptec 2805 (Voodoo80 Lite)
59+
9005:0285:9005:02d4 Adaptec ASR-2045 (Voodoo04 Lite)
60+
9005:0285:9005:02d5 Adaptec ASR-2405 (Voodoo40 Lite)
61+
9005:0285:9005:02d6 Adaptec ASR-2445 (Voodoo44 Lite)
62+
9005:0285:9005:02d7 Adaptec ASR-2805 (Voodoo80 Lite)
63+
9005:0285:9005:02d8 Adaptec 5405G (Voodoo40 PM)
64+
9005:0285:9005:02d9 Adaptec 5445G (Voodoo44 PM)
65+
9005:0285:9005:02da Adaptec 5805G (Voodoo80 PM)
66+
9005:0285:9005:02db Adaptec 5085G (Voodoo08 PM)
67+
9005:0285:9005:02dc Adaptec 51245G (Voodoo124 PM)
68+
9005:0285:9005:02dd Adaptec 51645G (Voodoo164 PM)
69+
9005:0285:9005:02de Adaptec 52445G (Voodoo244 PM)
70+
9005:0285:9005:02df Adaptec ASR-2045G (Voodoo04 Lite PM)
71+
9005:0285:9005:02e0 Adaptec ASR-2405G (Voodoo40 Lite PM)
72+
9005:0285:9005:02e1 Adaptec ASR-2445G (Voodoo44 Lite PM)
73+
9005:0285:9005:02e2 Adaptec ASR-2805G (Voodoo80 Lite PM)
6374
1011:0046:9005:0364 Adaptec 5400S (Mustang)
75+
1011:0046:9005:0365 Adaptec 5400S (Mustang)
6476
9005:0287:9005:0800 Adaptec Themisto (Jupiter)
6577
9005:0200:9005:0200 Adaptec Themisto (Jupiter)
6678
9005:0286:9005:0800 Adaptec Callisto (Jupiter)
6779
1011:0046:9005:1364 Dell PERC 2/QC (Quad Channel, Mustang)
80+
1011:0046:9005:1365 Dell PERC 2/QC (Quad Channel, Mustang)
6881
1028:0001:1028:0001 Dell PERC 2/Si (Iguana)
6982
1028:0003:1028:0003 Dell PERC 3/Si (SlimFast)
7083
1028:0002:1028:0002 Dell PERC 3/Di (Opal)
71-
1028:0004:1028:0004 Dell PERC 3/DiF (Iguana)
84+
1028:0004:1028:0004 Dell PERC 3/SiF (Iguana)
85+
1028:0004:1028:00d0 Dell PERC 3/DiF (Iguana)
7286
1028:0002:1028:00d1 Dell PERC 3/DiV (Viper)
7387
1028:0002:1028:00d9 Dell PERC 3/DiL (Lexus)
7488
1028:000a:1028:0106 Dell PERC 3/DiJ (Jaguar)

‎block/bsg.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,13 @@ static int bsg_put_device(struct bsg_device *bd)
740740
mutex_lock(&bsg_mutex);
741741

742742
do_free = atomic_dec_and_test(&bd->ref_count);
743-
if (!do_free)
743+
if (!do_free) {
744+
mutex_unlock(&bsg_mutex);
744745
goto out;
746+
}
747+
748+
hlist_del(&bd->dev_list);
749+
mutex_unlock(&bsg_mutex);
745750

746751
dprintk("%s: tearing down\n", bd->name);
747752

@@ -757,10 +762,8 @@ static int bsg_put_device(struct bsg_device *bd)
757762
*/
758763
ret = bsg_complete_all_commands(bd);
759764

760-
hlist_del(&bd->dev_list);
761765
kfree(bd);
762766
out:
763-
mutex_unlock(&bsg_mutex);
764767
kref_put(&q->bsg_dev.ref, bsg_kref_release_function);
765768
if (do_free)
766769
blk_put_queue(q);

0 commit comments

Comments
 (0)