Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638691a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: Fix - again - partition detection when array becomes active
  Fix over-zealous flush_disk when changing device size.
  md: avoid spinlock problem in blk_throtl_exit
  md: correctly handle probe of an 'mdp' device.
  md: don't set_capacity before array is active.
  md: Fix raid1->raid0 takeover
parents 0a93ea2e f0b4f7e2

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ int invalidate_partition(struct gendisk *disk, int partno) 
	struct block_device *bdev = bdget_disk(disk, partno);

	if (bdev) {

		fsync_bdev(bdev);

		res = __invalidate_device(bdev);

		res = __invalidate_device(bdev, true);

		bdput(bdev);

	}

	return res;

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -3281,7 +3281,7 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, 
			struct block_device *bdev = opened_bdev[cnt];

			if (!bdev || ITYPE(drive_state[cnt].fd_device) != type)

				continue;

			__invalidate_device(bdev);

			__invalidate_device(bdev, true);

		}

		mutex_unlock(&open_lock);

	} else {

drivers/md/linear.c

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ static int linear_run (mddev_t *mddev) 


	if (md_check_no_bitmap(mddev))

		return -EINVAL;

	mddev->queue->queue_lock = &mddev->queue->__queue_lock;

	conf = linear_conf(mddev, mddev->raid_disks);



	if (!conf)

drivers/md/md.c

+27 −4
Original line number Diff line number Diff line
@@ -553,6 +553,9 @@ static mddev_t * mddev_find(dev_t unit) 
{

	mddev_t *mddev, *new = NULL;



	if (unit && MAJOR(unit) != MD_MAJOR)

		unit &= ~((1<<MdpMinorShift)-1);



 retry:

	spin_lock(&all_mddevs_lock);
@@ -4138,10 +4141,10 @@ array_size_store(mddev_t *mddev, const char *buf, size_t len) 
	}



	mddev->array_sectors = sectors;

	if (mddev->pers) {

		set_capacity(mddev->gendisk, mddev->array_sectors);

	if (mddev->pers)

		revalidate_disk(mddev->gendisk);



	}

	return len;

}
@@ -4624,6 +4627,7 @@ static int do_md_run(mddev_t *mddev) 
	}

	set_capacity(mddev->gendisk, mddev->array_sectors);

	revalidate_disk(mddev->gendisk);

	mddev->changed = 1;

	kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);

out:

	return err;
@@ -4712,6 +4716,7 @@ static void md_clean(mddev_t *mddev) 
	mddev->sync_speed_min = mddev->sync_speed_max = 0;

	mddev->recovery = 0;

	mddev->in_sync = 0;

	mddev->changed = 0;

	mddev->degraded = 0;

	mddev->safemode = 0;

	mddev->bitmap_info.offset = 0;
@@ -4827,6 +4832,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) 


		set_capacity(disk, 0);

		mutex_unlock(&mddev->open_mutex);

		mddev->changed = 1;

		revalidate_disk(disk);



		if (mddev->ro)
@@ -6011,7 +6017,7 @@ static int md_open(struct block_device *bdev, fmode_t mode) 
	atomic_inc(&mddev->openers);

	mutex_unlock(&mddev->open_mutex);



	check_disk_size_change(mddev->gendisk, bdev);

	check_disk_change(bdev);

 out:

	return err;

}
@@ -6026,6 +6032,21 @@ static int md_release(struct gendisk *disk, fmode_t mode) 


	return 0;

}



static int md_media_changed(struct gendisk *disk)

{

	mddev_t *mddev = disk->private_data;



	return mddev->changed;

}



static int md_revalidate(struct gendisk *disk)

{

	mddev_t *mddev = disk->private_data;



	mddev->changed = 0;

	return 0;

}

static const struct block_device_operations md_fops =

{

	.owner		= THIS_MODULE,
@@ -6036,6 +6057,8 @@ static const struct block_device_operations md_fops = 
	.compat_ioctl	= md_compat_ioctl,

#endif

	.getgeo		= md_getgeo,

	.media_changed  = md_media_changed,

	.revalidate_disk= md_revalidate,

};



static int md_thread(void * arg)

drivers/md/md.h

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,8 @@ struct mddev_s 
	atomic_t			active;		/* general refcount */

	atomic_t			openers;	/* number of active opens */



	int				changed;	/* True if we might need to

							 * reread partition info */

	int				degraded;	/* whether md should consider

							 * adding a spare

							 */