linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / mtd_blkdevs.c

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 458d3c8..7f3ff50 100644 (file)
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -19,12 +19,12 @@
 #include <linux/spinlock.h>
 #include <linux/hdreg.h>
 #include <linux/init.h>
-#include <linux/mutex.h>
+#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 static LIST_HEAD(blktrans_majors);
 
-extern struct mutex mtd_table_mutex;
+extern struct semaphore mtd_table_mutex;
 extern struct mtd_info *mtd_table[];
 
 struct mtd_blkcore_priv {
@@ -122,9 +122,9 @@ static int mtd_blktrans_thread(void *arg)
 
                spin_unlock_irq(rq->queue_lock);
 
-               mutex_lock(&dev->lock);
+               down(&dev->sem);
                res = do_blktrans_request(tr, dev, req);
-               mutex_unlock(&dev->lock);
+               up(&dev->sem);
 
                spin_lock_irq(rq->queue_lock);
 
@@ -235,8 +235,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        int last_devnum = -1;
        struct gendisk *gd;
 
-       if (!!mutex_trylock(&mtd_table_mutex)) {
-               mutex_unlock(&mtd_table_mutex);
+       if (!down_trylock(&mtd_table_mutex)) {
+               up(&mtd_table_mutex);
                BUG();
        }
 
@@ -267,7 +267,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
                return -EBUSY;
        }
 
-       mutex_init(&new->lock);
+       init_MUTEX(&new->sem);
        list_add_tail(&new->list, &tr->devs);
  added:
        if (!tr->writesect)
@@ -313,8 +313,8 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 
 int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
 {
-       if (!!mutex_trylock(&mtd_table_mutex)) {
-               mutex_unlock(&mtd_table_mutex);
+       if (!down_trylock(&mtd_table_mutex)) {
+               up(&mtd_table_mutex);
                BUG();
        }
 
@@ -378,14 +378,14 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
 
        memset(tr->blkcore_priv, 0, sizeof(*tr->blkcore_priv));
 
-       mutex_lock(&mtd_table_mutex);
+       down(&mtd_table_mutex);
 
        ret = register_blkdev(tr->major, tr->name);
        if (ret) {
                printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n",
                       tr->name, tr->major, ret);
                kfree(tr->blkcore_priv);
-               mutex_unlock(&mtd_table_mutex);
+               up(&mtd_table_mutex);
                return ret;
        }
        spin_lock_init(&tr->blkcore_priv->queue_lock);
@@ -396,7 +396,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
        if (!tr->blkcore_priv->rq) {
                unregister_blkdev(tr->major, tr->name);
                kfree(tr->blkcore_priv);
-               mutex_unlock(&mtd_table_mutex);
+               up(&mtd_table_mutex);
                return -ENOMEM;
        }
 
@@ -407,7 +407,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
                blk_cleanup_queue(tr->blkcore_priv->rq);
                unregister_blkdev(tr->major, tr->name);
                kfree(tr->blkcore_priv);
-               mutex_unlock(&mtd_table_mutex);
+               up(&mtd_table_mutex);
                return ret;
        }
 
@@ -419,7 +419,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
                        tr->add_mtd(tr, mtd_table[i]);
        }
 
-       mutex_unlock(&mtd_table_mutex);
+       up(&mtd_table_mutex);
 
        return 0;
 }
@@ -428,7 +428,7 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)
 {
        struct list_head *this, *next;
 
-       mutex_lock(&mtd_table_mutex);
+       down(&mtd_table_mutex);
 
        /* Clean up the kernel thread */
        tr->blkcore_priv->exiting = 1;
@@ -446,11 +446,12 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)
        blk_cleanup_queue(tr->blkcore_priv->rq);
        unregister_blkdev(tr->major, tr->name);
 
-       mutex_unlock(&mtd_table_mutex);
+       up(&mtd_table_mutex);
 
        kfree(tr->blkcore_priv);
 
-       BUG_ON(!list_empty(&tr->devs));
+       if (!list_empty(&tr->devs))
+               BUG();
        return 0;
 }