if (!ops->rw_page || bdev_get_integrity(bdev))
                return result;
 
-       result = blk_queue_enter(bdev->bd_disk->queue, 0);
+       result = blk_queue_enter(bdev_get_queue(bdev), 0);
        if (result)
                return result;
        result = ops->rw_page(bdev, sector + get_start_sect(bdev), page,
                              REQ_OP_READ);
-       blk_queue_exit(bdev->bd_disk->queue);
+       blk_queue_exit(bdev_get_queue(bdev));
        return result;
 }
 
 
        if (!ops->rw_page || bdev_get_integrity(bdev))
                return -EOPNOTSUPP;
-       result = blk_queue_enter(bdev->bd_disk->queue, 0);
+       result = blk_queue_enter(bdev_get_queue(bdev), 0);
        if (result)
                return result;
 
                clean_page_buffers(page);
                unlock_page(page);
        }
-       blk_queue_exit(bdev->bd_disk->queue);
+       blk_queue_exit(bdev_get_queue(bdev));
        return result;
 }