Commit 0f48f260 authored Jun 02, 2011 by Linus Torvalds

block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal



Jens' back-merge commit 698567f3 ("Merge commit 'v2.6.39' into
for-2.6.40/core") was incorrectly done, and re-introduced the
DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits

 - 9fd097b1 ("block: unexport DISK_EVENT_MEDIA_CHANGE for
   legacy/fringe drivers")

 - 7eec77a1 ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd
   and ide-cd")

because of conflicts with the "g->flags" updates near-by by commit
d4dc210f ("block: don't block events on excl write for non-optical
devices")

As a result, we re-introduced the hanging behavior due to infinite disk
media change reports.

Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't
do them to hide merge conflicts from me - especially as I'm likely
better at merging them than you are, since I do so many merges.

Reported-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3f303103

drivers/block/paride/pcd.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@ static void pcd_init_units(void)
		strcpy(disk->disk_name, cd->name); /* umm... */
		disk->fops = &pcd_bdops;
		disk->flags = GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
		disk->events = DISK_EVENT_MEDIA_CHANGE;
		}
		}

drivers/cdrom/viocd.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -627,7 +627,6 @@ static int viocd_probe(struct vio_dev vdev, const struct vio_device_id id)
		gendisk->fops = &viocd_fops;
		gendisk->flags = GENHD_FL_CD \| GENHD_FL_REMOVABLE \|
		GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
		gendisk->events = DISK_EVENT_MEDIA_CHANGE;
		set_capacity(gendisk, 0);
		gendisk->private_data = d;
		d->viocd_disk = gendisk;

drivers/ide/ide-cd.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1782,7 +1782,6 @@ static int ide_cd_probe(ide_drive_t *drive)
		ide_cd_read_toc(drive, &sense);
		g->fops = &idecd_ops;
		g->flags \|= GENHD_FL_REMOVABLE \| GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE;
		g->events = DISK_EVENT_MEDIA_CHANGE;
		add_disk(g);
		return 0;

Admin message