aboutsummaryrefslogtreecommitdiffstats
path: root/block/bsg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 21:58:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 21:58:04 -0400
commit89a93f2f4834f8c126e8d9dd6b368d0b9e21ec3d (patch)
treee731456fec0cab1225ad3e806dc8d3efefa0a78b /block/bsg.c
parent260eddf4391f162a69d1d163729249635fa7a78f (diff)
parentfe9233fb6914a0eb20166c967e3020f7f0fba2c9 (diff)
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 ...
Diffstat (limited to 'block/bsg.c')
-rw-r--r--block/bsg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 0b3b282f0384..5fb9b0bdbe85 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -740,8 +740,13 @@ static int bsg_put_device(struct bsg_device *bd)
740 mutex_lock(&bsg_mutex); 740 mutex_lock(&bsg_mutex);
741 741
742 do_free = atomic_dec_and_test(&bd->ref_count); 742 do_free = atomic_dec_and_test(&bd->ref_count);
743 if (!do_free) 743 if (!do_free) {
744 mutex_unlock(&bsg_mutex);
744 goto out; 745 goto out;
746 }
747
748 hlist_del(&bd->dev_list);
749 mutex_unlock(&bsg_mutex);
745 750
746 dprintk("%s: tearing down\n", bd->name); 751 dprintk("%s: tearing down\n", bd->name);
747 752
@@ -757,10 +762,8 @@ static int bsg_put_device(struct bsg_device *bd)
757 */ 762 */
758 ret = bsg_complete_all_commands(bd); 763 ret = bsg_complete_all_commands(bd);
759 764
760 hlist_del(&bd->dev_list);
761 kfree(bd); 765 kfree(bd);
762out: 766out:
763 mutex_unlock(&bsg_mutex);
764 kref_put(&q->bsg_dev.ref, bsg_kref_release_function); 767 kref_put(&q->bsg_dev.ref, bsg_kref_release_function);
765 if (do_free) 768 if (do_free)
766 blk_put_queue(q); 769 blk_put_queue(q);