projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
scsi
/
ide-scsi.c
diff --git
a/drivers/scsi/ide-scsi.c
b/drivers/scsi/ide-scsi.c
index
0cf0e4c
..
39b760a
100644
(file)
--- a/
drivers/scsi/ide-scsi.c
+++ b/
drivers/scsi/ide-scsi.c
@@
-47,6
+47,7
@@
#include <linux/ide.h>
#include <linux/scatterlist.h>
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/scatterlist.h>
#include <linux/delay.h>
+#include <linux/mutex.h>
#include <asm/io.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/bitops.h>
@@
-109,7
+110,7
@@
typedef struct ide_scsi_obj {
unsigned long log; /* log flags */
} idescsi_scsi_t;
unsigned long log; /* log flags */
} idescsi_scsi_t;
-static DE
CLARE_MUTEX(idescsi_ref_sem
);
+static DE
FINE_MUTEX(idescsi_ref_mutex
);
#define ide_scsi_g(disk) \
container_of((disk)->private_data, struct ide_scsi_obj, driver)
#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;
{
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);
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)
{
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);
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)
}
static inline idescsi_scsi_t *scsihost_to_idescsi(struct Scsi_Host *host)