From 54509ae5d15bb48f20658f569eb330bc5cc85e27 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Thu, 23 Mar 2006 03:00:22 -0800 Subject: [PATCH] --- yaml --- r: 23039 b: refs/heads/master c: e723ccd805857a46d3b63fbd20edea8579c6c541 h: refs/heads/master i: 23037: bc69c3ddeb77777061ebef60830c3d200399eb81 23035: ecbef91b7e9e4c85caf146b02dbef1b25508a2bd 23031: 6605702f069c99c1cf40ce462a49dab90e51973c 23023: a946e18c1510b2ca6836eef5675da898e18de766 23007: 5b74a81b77fd4d2c9270bd48174e6bfbeb83cf28 22975: ba9f6bd842744ea9b74a31b99bfeb2c446c63658 22911: 9e447b0c43cb747d753a39de11a0b49dc4a9f7a3 22783: ff4af8deeadbd91a82ab92f9fcfe9d0d538d6dbb 22527: 39c72eff6be891261acf8c0b8203327be14b8cf6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ide-scsi.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0dafb588a0c0..81630d4185b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ed965d612d9e9bc08805c75123f063cf6966311 +refs/heads/master: e723ccd805857a46d3b63fbd20edea8579c6c541 diff --git a/trunk/drivers/scsi/ide-scsi.c b/trunk/drivers/scsi/ide-scsi.c index 0cf0e4c7ac0c..39b760a24241 100644 --- a/trunk/drivers/scsi/ide-scsi.c +++ b/trunk/drivers/scsi/ide-scsi.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -109,7 +110,7 @@ typedef struct ide_scsi_obj { unsigned long log; /* log flags */ } idescsi_scsi_t; -static DECLARE_MUTEX(idescsi_ref_sem); +static DEFINE_MUTEX(idescsi_ref_mutex); #define ide_scsi_g(disk) \ container_of((disk)->private_data, struct ide_scsi_obj, driver) @@ -118,19 +119,19 @@ static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk) { struct ide_scsi_obj *scsi = NULL; - down(&idescsi_ref_sem); + mutex_lock(&idescsi_ref_mutex); scsi = ide_scsi_g(disk); if (scsi) scsi_host_get(scsi->host); - up(&idescsi_ref_sem); + mutex_unlock(&idescsi_ref_mutex); return scsi; } static void ide_scsi_put(struct ide_scsi_obj *scsi) { - down(&idescsi_ref_sem); + mutex_lock(&idescsi_ref_mutex); scsi_host_put(scsi->host); - up(&idescsi_ref_sem); + mutex_unlock(&idescsi_ref_mutex); } static inline idescsi_scsi_t *scsihost_to_idescsi(struct Scsi_Host *host)