Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 07:30:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

s390/tape_block: Convert to bdops->check_events()

Browse Source 
Convert from ->media_changed() to ->check_events().

s390/tape_block buffers media changed state and clears it on
revalidation.  It will behave correctly with kernel event polling.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Tejun Heo 2011-03-09 19:54:28 +01:00
parent f47350fdec
commit ffe80cea35
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/s390/char/tape_block.c
View File

@ -48,14 +48,14 @@
static DEFINE_MUTEX(tape_block_mutex); static DEFINE_MUTEX(tape_block_mutex);
static int tapeblock_open(struct block_device *, fmode_t); static int tapeblock_open(struct block_device *, fmode_t);
static int tapeblock_release(struct gendisk *, fmode_t); static int tapeblock_release(struct gendisk *, fmode_t);
static int tapeblock_medium_changed(struct gendisk *); static unsigned int tapeblock_check_events(struct gendisk *, unsigned int);
static int tapeblock_revalidate_disk(struct gendisk *); static int tapeblock_revalidate_disk(struct gendisk *);
static const struct block_device_operations tapeblock_fops = { static const struct block_device_operations tapeblock_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = tapeblock_open, .open = tapeblock_open,
.release = tapeblock_release, .release = tapeblock_release,
.media_changed = tapeblock_medium_changed, .check_events = tapeblock_check_events,
.revalidate_disk = tapeblock_revalidate_disk, .revalidate_disk = tapeblock_revalidate_disk,
}; };
@ -237,6 +237,7 @@ tapeblock_setup_device(struct tape_device * device)
disk->major = tapeblock_major; disk->major = tapeblock_major;
disk->first_minor = device->first_minor; disk->first_minor = device->first_minor;
disk->fops = &tapeblock_fops; disk->fops = &tapeblock_fops;
disk->events = DISK_EVENT_MEDIA_CHANGE;
disk->private_data = tape_get_device(device); disk->private_data = tape_get_device(device);
disk->queue = blkdat->request_queue; disk->queue = blkdat->request_queue;
set_capacity(disk, 0); set_capacity(disk, 0);
@ -340,8 +341,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
return 0; return 0;
} }
static int static unsigned int
tapeblock_medium_changed(struct gendisk *disk) tapeblock_check_events(struct gendisk *disk, unsigned int clearing)
{ {
struct tape_device *device; struct tape_device *device;
@ -349,7 +350,7 @@ tapeblock_medium_changed(struct gendisk *disk)
DBF_LH(6, "tapeblock_medium_changed(%p) = %d\n", DBF_LH(6, "tapeblock_medium_changed(%p) = %d\n",
device, device->blk_data.medium_changed); device, device->blk_data.medium_changed);
return device->blk_data.medium_changed; return device->blk_data.medium_changed ? DISK_EVENT_MEDIA_CHANGE : 0;
} }
/* /*