Merge tag 'pull-bd_flags-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-block.git] / block / bdev.c

diff --git a/block/bdev.c b/block/bdev.c
index 5a03c93ba2221b83c663ae74cb83a81ca9db9ceb..353677ac49b3b9677f918340c622918617cee3fd 100644 (file)
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -422,13 +422,11 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
        mutex_init(&bdev->bd_fsfreeze_mutex);
        spin_lock_init(&bdev->bd_size_lock);
        mutex_init(&bdev->bd_holder_lock);
-       bdev->bd_partno = partno;
+       atomic_set(&bdev->__bd_flags, partno);
        bdev->bd_mapping = &inode->i_data;
        bdev->bd_queue = disk->queue;
-       if (partno)
-               bdev->bd_has_submit_bio = disk->part0->bd_has_submit_bio;
-       else
-               bdev->bd_has_submit_bio = false;
+       if (partno && bdev_test_flag(disk->part0, BD_HAS_SUBMIT_BIO))
+               bdev_set_flag(bdev, BD_HAS_SUBMIT_BIO);
        bdev->bd_stats = alloc_percpu(struct disk_stats);
        if (!bdev->bd_stats) {
                iput(inode);
@@ -642,7 +640,7 @@ static void bd_end_claim(struct block_device *bdev, void *holder)
                bdev->bd_holder = NULL;
                bdev->bd_holder_ops = NULL;
                mutex_unlock(&bdev->bd_holder_lock);
-               if (bdev->bd_write_holder)
+               if (bdev_test_flag(bdev, BD_WRITE_HOLDER))
                        unblock = true;
        }
        if (!whole->bd_holders)
@@ -655,7 +653,7 @@ static void bd_end_claim(struct block_device *bdev, void *holder)
         */
        if (unblock) {
                disk_unblock_events(bdev->bd_disk);
-               bdev->bd_write_holder = false;
+               bdev_clear_flag(bdev, BD_WRITE_HOLDER);
        }
 }
 
@@ -922,9 +920,10 @@ int bdev_open(struct block_device *bdev, blk_mode_t mode, void *holder,
                 * writeable reference is too fragile given the way @mode is
                 * used in blkdev_get/put().
                 */
-               if ((mode & BLK_OPEN_WRITE) && !bdev->bd_write_holder &&
+               if ((mode & BLK_OPEN_WRITE) &&
+                   !bdev_test_flag(bdev, BD_WRITE_HOLDER) &&
                    (disk->event_flags & DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE)) {
-                       bdev->bd_write_holder = true;
+                       bdev_set_flag(bdev, BD_WRITE_HOLDER);
                        unblock_events = false;
                }
        }