Merge tag 'for-linus-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw...

[linux-2.6-microblaze.git] / drivers / block / loop.c

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f1dda4e..084f9b8 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1102,7 +1102,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,
                lo->lo_flags |= LO_FLAGS_PARTSCAN;
        partscan = lo->lo_flags & LO_FLAGS_PARTSCAN;
        if (partscan)
-               lo->lo_disk->flags &= ~GENHD_FL_NO_PART;
+               clear_bit(GD_SUPPRESS_PART_SCAN, &lo->lo_disk->state);
 
        loop_global_unlock(lo, is_loop);
        if (partscan)
@@ -1198,7 +1198,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
         */
        lo->lo_flags = 0;
        if (!part_shift)
-               lo->lo_disk->flags |= GENHD_FL_NO_PART;
+               set_bit(GD_SUPPRESS_PART_SCAN, &lo->lo_disk->state);
        mutex_lock(&lo->lo_mutex);
        lo->lo_state = Lo_unbound;
        mutex_unlock(&lo->lo_mutex);
@@ -1308,7 +1308,7 @@ out_unfreeze:
 
        if (!err && (lo->lo_flags & LO_FLAGS_PARTSCAN) &&
             !(prev_lo_flags & LO_FLAGS_PARTSCAN)) {
-               lo->lo_disk->flags &= ~GENHD_FL_NO_PART;
+               clear_bit(GD_SUPPRESS_PART_SCAN, &lo->lo_disk->state);
                partscan = true;
        }
 out_unlock:
@@ -2011,7 +2011,7 @@ static int loop_add(int i)
         * userspace tools. Parameters like this in general should be avoided.
         */
        if (!part_shift)
-               disk->flags |= GENHD_FL_NO_PART;
+               set_bit(GD_SUPPRESS_PART_SCAN, &disk->state);
        mutex_init(&lo->lo_mutex);
        lo->lo_number           = i;
        spin_lock_init(&lo->lo_lock);