Merge tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel...

Pull more xen updates from Juergen Gross:
 "Some minor cleanup patches and a small series disentangling some Xen
  related Kconfig options"

* tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: Kconfig: remove X86_64 depends from XEN_512GB
  xen/manage: Fix fall-through warnings for Clang
  xen-blkfront: Fix fall-through warnings for Clang
  xen: remove trailing semicolon in macro definition
  xen: Kconfig: nest Xen guest options
  xen: Remove Xen PVH/PVHVM dependency on PCI
  x86/xen: Convert to DEFINE_SHOW_ATTRIBUTE

diff --combined drivers/block/xen-blkfront.c
index 188e0b47534bcf664fa35ca332fe338c49787c14,34b028be78ab16bc53b31f1ea582720dfb96c7b5..5265975b3fba5c0c726b7ed5bd5f595cd6bd5145
--- 1/drivers/block/xen-blkfront.c
--- 2/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@@ -2153,7 -2153,7 +2153,7 @@@ static void blkfront_closing(struct blk
        }
  
        if (info->gd)
 -              bdev = bdget_disk(info->gd, 0);
 +              bdev = bdgrab(info->gd->part0);
  
        mutex_unlock(&info->mutex);
  
@@@ -2370,7 -2370,7 +2370,7 @@@ static void blkfront_connect(struct blk
                        return;
                printk(KERN_INFO "Setting capacity to %Lu\n",
                       sectors);
 -              set_capacity_revalidate_and_notify(info->gd, sectors, true);
 +              set_capacity_and_notify(info->gd, sectors);
  
                return;
        case BLKIF_STATE_SUSPENDED:
@@@ -2462,6 -2462,7 +2462,7 @@@ static void blkback_changed(struct xenb
                        break;
                if (talk_to_blkback(dev, info))
                        break;
+               break;
        case XenbusStateInitialising:
        case XenbusStateInitialised:
        case XenbusStateReconfiguring:
@@@ -2518,7 -2519,7 +2519,7 @@@ static int blkfront_remove(struct xenbu
  
        disk = info->gd;
        if (disk)
 -              bdev = bdget_disk(disk, 0);
 +              bdev = bdgrab(disk->part0);
  
        info->xbdev = NULL;
        mutex_unlock(&info->mutex);
@@@ -2595,11 -2596,19 +2596,11 @@@ out
  static void blkif_release(struct gendisk *disk, fmode_t mode)
  {
        struct blkfront_info *info = disk->private_data;
 -      struct block_device *bdev;
        struct xenbus_device *xbdev;
  
        mutex_lock(&blkfront_mutex);
 -
 -      bdev = bdget_disk(disk, 0);
 -
 -      if (!bdev) {
 -              WARN(1, "Block device %s yanked out from us!\n", disk->disk_name);
 +      if (disk->part0->bd_openers)
                goto out_mutex;
 -      }
 -      if (bdev->bd_openers)
 -              goto out;
  
        /*
         * Check if we have been instructed to close. We will have
@@@ -2611,7 -2620,7 +2612,7 @@@
  
        if (xbdev && xbdev->state == XenbusStateClosing) {
                /* pending switch to state closed */
 -              dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n");
 +              dev_info(disk_to_dev(disk), "releasing disk\n");
                xlvbd_release_gendisk(info);
                xenbus_frontend_closed(info->xbdev);
        }
@@@ -2620,12 -2629,14 +2621,12 @@@
  
        if (!xbdev) {
                /* sudden device removal */
 -              dev_info(disk_to_dev(bdev->bd_disk), "releasing disk\n");
 +              dev_info(disk_to_dev(disk), "releasing disk\n");
                xlvbd_release_gendisk(info);
                disk->private_data = NULL;
                free_info(info);
        }
  
 -out:
 -      bdput(bdev);
  out_mutex:
        mutex_unlock(&blkfront_mutex);
  }