Merge tag 'mtd/for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

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

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 12c1803..b8ae1ec 100644 (file)
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -376,6 +376,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        if (tr->discard) {
                blk_queue_flag_set(QUEUE_FLAG_DISCARD, new->rq);
                blk_queue_max_discard_sectors(new->rq, UINT_MAX);
        if (tr->discard) {
                blk_queue_flag_set(QUEUE_FLAG_DISCARD, new->rq);
                blk_queue_max_discard_sectors(new->rq, UINT_MAX);

+               new->rq->limits.discard_granularity = tr->blksize;

        }
 
        gd->queue = new->rq;
        }
 
        gd->queue = new->rq;


@@ -479,14 +480,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
        if (!blktrans_notifier.list.next)
                register_mtd_user(&blktrans_notifier);
 
        if (!blktrans_notifier.list.next)
                register_mtd_user(&blktrans_notifier);
 

-
-       mutex_lock(&mtd_table_mutex);
-

        ret = register_blkdev(tr->major, tr->name);
        if (ret < 0) {
                printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n",
                       tr->name, tr->major, ret);
        ret = register_blkdev(tr->major, tr->name);
        if (ret < 0) {
                printk(KERN_WARNING "Unable to register %s block device on major %d: %d\n",
                       tr->name, tr->major, ret);

-               mutex_unlock(&mtd_table_mutex);

                return ret;
        }
 
                return ret;
        }
 


@@ -496,12 +493,12 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
        tr->blkshift = ffs(tr->blksize) - 1;
 
        INIT_LIST_HEAD(&tr->devs);
        tr->blkshift = ffs(tr->blksize) - 1;
 
        INIT_LIST_HEAD(&tr->devs);

-       list_add(&tr->list, &blktrans_majors);

 
 

+       mutex_lock(&mtd_table_mutex);
+       list_add(&tr->list, &blktrans_majors);

        mtd_for_each_device(mtd)
                if (mtd->type != MTD_ABSENT)
                        tr->add_mtd(tr, mtd);
        mtd_for_each_device(mtd)
                if (mtd->type != MTD_ABSENT)
                        tr->add_mtd(tr, mtd);

-

        mutex_unlock(&mtd_table_mutex);
        return 0;
 }
        mutex_unlock(&mtd_table_mutex);
        return 0;
 }


@@ -518,8 +515,8 @@ int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr)
        list_for_each_entry_safe(dev, next, &tr->devs, list)
                tr->remove_dev(dev);
 
        list_for_each_entry_safe(dev, next, &tr->devs, list)
                tr->remove_dev(dev);
 

-       unregister_blkdev(tr->major, tr->name);

        mutex_unlock(&mtd_table_mutex);
        mutex_unlock(&mtd_table_mutex);

+       unregister_blkdev(tr->major, tr->name);

 
        BUG_ON(!list_empty(&tr->devs));
        return 0;
 
        BUG_ON(!list_empty(&tr->devs));
        return 0;