diff --git a/block/genhd.c b/block/genhd.c
index 94b0fe34a755f77016fd7eb34a876e45bffb3294..4211722e1c85c6ecd0a8ae2b29f79ee0b4d907fd 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -646,7 +646,7 @@ static void register_disk(struct device *parent, struct gendisk *disk)
 	if (!bdev)
 		goto exit;
 
-	set_bit(GD_NEED_PART_SCAN, &disk->state);
+	set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	err = blkdev_get(bdev, FMODE_READ, NULL);
 	if (err < 0)
 		goto exit;
diff --git a/block/partition-generic.c b/block/partition-generic.c
index b8481079c58a1187acc49954380d6ae17e481383..ae3761fed854dd49cb64aa05d0b31cf3aa833993 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -546,7 +546,7 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
 	if (disk->fops->revalidate_disk)
 		disk->fops->revalidate_disk(disk);
 	check_disk_size_change(disk, bdev, true);
-	clear_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+	clear_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	if (!get_capacity(disk) || !(state = check_partition(disk, bdev)))
 		return 0;
 	if (IS_ERR(state)) {
@@ -662,7 +662,7 @@ int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
 {
 	int res;
 
-	if (!test_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state))
+	if (!test_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags))
 		return 0;
 
 	res = drop_partitions(disk, bdev);
@@ -671,7 +671,7 @@ int invalidate_partitions(struct gendisk *disk, struct block_device *bdev)
 
 	set_capacity(disk, 0);
 	check_disk_size_change(disk, bdev, false);
-	clear_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+	clear_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	/* tell userspace that the media / partition table may have changed */
 	kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 833525f41005dcda59798966c003ecfe0c01864b..b0a45edddafdd8e5ae62e893f4fbcb0525a5be9a 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -317,7 +317,7 @@ static void nbd_size_update(struct nbd_device *nbd, bool start)
 			if (start)
 				set_blocksize(bdev, config->blksize);
 		} else
-			set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
+			set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 		bdput(bdev);
 	}
 	kobject_uevent(&nbd_to_dev(nbd)->kobj, KOBJ_CHANGE);
@@ -1343,7 +1343,7 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b
 		return ret;
 
 	if (max_part)
-		set_bit(GD_NEED_PART_SCAN, &nbd->disk->state);
+		set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	mutex_unlock(&nbd->config_lock);
 	ret = wait_event_interruptible(config->recv_wq,
 					 atomic_read(&config->recv_threads) == 0);
@@ -1524,9 +1524,9 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)
 		refcount_set(&nbd->config_refs, 1);
 		refcount_inc(&nbd->refs);
 		mutex_unlock(&nbd->config_lock);
-		set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+		set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	} else if (nbd_disconnected(nbd->config)) {
-		set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+		set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	}
 out:
 	mutex_unlock(&nbd_index_mutex);
diff --git a/fs/block_dev.c b/fs/block_dev.c
index e255c3b65224d96942d1fd3598c34caf220a270b..f521b7cf907fa9c8c7afe0b8749aa978695786b6 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -922,6 +922,7 @@ struct block_device *bdget(dev_t dev)
 		bdev->bd_inode = inode;
 		bdev->bd_block_size = i_blocksize(inode);
 		bdev->bd_part_count = 0;
+		bdev->bd_flags = 0;
 		inode->i_mode = S_IFBLK;
 		inode->i_rdev = dev;
 		inode->i_bdev = bdev;
@@ -1403,7 +1404,7 @@ static void flush_disk(struct block_device *bdev, bool kill_dirty)
 		       "resized disk %s\n",
 		       bdev->bd_disk ? bdev->bd_disk->disk_name : "");
 	}
-	set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+	set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 }
 
 /**
@@ -1456,7 +1457,7 @@ int revalidate_disk(struct gendisk *disk)
 
 	mutex_lock(&bdev->bd_mutex);
 	check_disk_size_change(disk, bdev, ret == 0);
-	clear_bit(GD_NEED_PART_SCAN, &disk->state);
+	clear_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	mutex_unlock(&bdev->bd_mutex);
 	bdput(bdev);
 	return ret;
@@ -1519,7 +1520,7 @@ static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
 		up_read(&disk->lookup_sem);
 	} else {
 		check_disk_size_change(bdev->bd_disk, bdev, !invalidate);
-		clear_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
+		clear_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
 	}
 }
 
@@ -1604,7 +1605,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 			 * The latter is necessary to prevent ghost
 			 * partitions on a removed medium.
 			 */
-			if (test_bit(GD_NEED_PART_SCAN, &disk->state) &&
+			if (test_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags) &&
 			    (!ret || ret == -ENOMEDIUM))
 				bdev_disk_changed(bdev, ret == -ENOMEDIUM);
 
@@ -1641,7 +1642,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 			if (bdev->bd_disk->fops->open)
 				ret = bdev->bd_disk->fops->open(bdev, mode);
 			/* the same as first opener case, read comment there */
-			if (test_bit(GD_NEED_PART_SCAN, &disk->state) &&
+			if (test_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags) &&
 			    (!ret || ret == -ENOMEDIUM))
 				bdev_disk_changed(bdev, ret == -ENOMEDIUM);
 			if (ret)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 025b98fbab0547bf626fb2ec396abcce525731fe..480936c2d9382284a4397ed34837a4a33a6f48df 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -459,6 +459,8 @@ struct address_space {
 	 */
 struct request_queue;
 
+#define BDEV_NEED_PART_SCAN            0
+
 struct block_device {
 	dev_t			bd_dev;  /* not a kdev_t - it's a search key */
 	int			bd_openers;
@@ -479,6 +481,7 @@ struct block_device {
 	struct hd_struct *	bd_part;
 	/* number of times partitions within this device have been opened. */
 	unsigned		bd_part_count;
+	unsigned long		bd_flags;
 	struct gendisk *	bd_disk;
 	struct request_queue *  bd_queue;
 	struct backing_dev_info *bd_bdi;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index f3fc01f0e84cba8f3f8b1bfdb57dad0150f010d3..58a819484fb4f884335cfb80e175add72140988a 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -208,8 +208,6 @@ struct gendisk {
 	void *private_data;
 
 	int flags;
-	unsigned long state;
-#define GD_NEED_PART_SCAN		0
 	struct rw_semaphore lookup_sem;
 	struct kobject *slave_dir;