Skip to content

Commit

Permalink
md: remove ->changed and related code.
Browse files Browse the repository at this point in the history
We set ->changed to 1 and call check_disk_change at the end
of md_open so that bd_invalidated would be set and thus
partition rescan would happen appropriately.

Now that we call revalidate_disk directly, which sets bd_invalidates,
that indirection is no longer needed and can be removed.

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed May 18, 2010
1 parent 49ce6ce commit b821eaa
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 25 deletions.
22 changes: 1 addition & 21 deletions drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -4501,7 +4501,6 @@ static int do_md_run(mddev_t * mddev)
md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */

revalidate_disk(mddev->gendisk);
mddev->changed = 1;
md_new_event(mddev);
sysfs_notify_dirent(mddev->sysfs_state);
if (mddev->sysfs_action)
Expand Down Expand Up @@ -4620,7 +4619,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
}

set_capacity(disk, 0);
mddev->changed = 1;
revalidate_disk(disk);

if (mddev->ro)
mddev->ro = 0;
Expand Down Expand Up @@ -4686,7 +4685,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
mddev->sync_speed_min = mddev->sync_speed_max = 0;
mddev->recovery = 0;
mddev->in_sync = 0;
mddev->changed = 0;
mddev->degraded = 0;
mddev->barriers_work = 0;
mddev->safemode = 0;
Expand Down Expand Up @@ -5850,7 +5848,6 @@ static int md_open(struct block_device *bdev, fmode_t mode)
atomic_inc(&mddev->openers);
mutex_unlock(&mddev->open_mutex);

check_disk_change(bdev);
out:
return err;
}
Expand All @@ -5865,21 +5862,6 @@ 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,
Expand All @@ -5890,8 +5872,6 @@ 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)
Expand Down
1 change: 0 additions & 1 deletion drivers/md/md.h
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ 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
*/
Expand Down
1 change: 0 additions & 1 deletion drivers/md/raid1.c
Original file line number Diff line number Diff line change
Expand Up @@ -2184,7 +2184,6 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors)
if (mddev->array_sectors > raid1_size(mddev, sectors, 0))
return -EINVAL;
set_capacity(mddev->gendisk, mddev->array_sectors);
mddev->changed = 1;
revalidate_disk(mddev->gendisk);
if (sectors > mddev->dev_sectors &&
mddev->recovery_cp == MaxSector) {
Expand Down
2 changes: 0 additions & 2 deletions drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -5335,7 +5335,6 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)
raid5_size(mddev, sectors, mddev->raid_disks))
return -EINVAL;
set_capacity(mddev->gendisk, mddev->array_sectors);
mddev->changed = 1;
revalidate_disk(mddev->gendisk);
if (sectors > mddev->dev_sectors && mddev->recovery_cp == MaxSector) {
mddev->recovery_cp = mddev->dev_sectors;
Expand Down Expand Up @@ -5549,7 +5548,6 @@ static void raid5_finish_reshape(mddev_t *mddev)
if (mddev->delta_disks > 0) {
md_set_array_sectors(mddev, raid5_size(mddev, 0, 0));
set_capacity(mddev->gendisk, mddev->array_sectors);
mddev->changed = 1;
revalidate_disk(mddev->gendisk);
} else {
int d;
Expand Down

0 comments on commit b821eaa

Please sign in to comment.