Merge tag 'v3.10.86' into update

This is the 3.10.86 stable release
2018-03-21 22:47:17 +01:00
parent 38b8911896 78fb9f4236
commit 45f8c76c71
27 changed files with 198 additions and 30 deletions
@@ -720,8 +720,12 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol,
 		return -EINVAL;

 	disk = get_gendisk(MKDEV(major, minor), &part);
-	if (!disk || part)
+	if (!disk)
 		return -EINVAL;
+	if (part) {
+		put_disk(disk);
+		return -EINVAL;
+	}

 	rcu_read_lock();
 	spin_lock_irq(disk->queue->queue_lock);