From 6267314a7d3be96f76366c7e9a67b41b54914e05 Mon Sep 17 00:00:00 2001 From: Horst Hummel Date: Wed, 1 Feb 2006 03:06:36 -0800 Subject: [PATCH] --- yaml --- r: 19442 b: refs/heads/master c: 57467195d1581e354998d5cc35dfd7a12d6e0a24 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/block/dasd_ioctl.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46c389abcf34..97d6323af2af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 600b5d163d7434332539cac7be00f649cbbfedcc +refs/heads/master: 57467195d1581e354998d5cc35dfd7a12d6e0a24 diff --git a/trunk/drivers/s390/block/dasd_ioctl.c b/trunk/drivers/s390/block/dasd_ioctl.c index 74ed5f4dd5e0..fafeeae52675 100644 --- a/trunk/drivers/s390/block/dasd_ioctl.c +++ b/trunk/drivers/s390/block/dasd_ioctl.c @@ -421,8 +421,15 @@ dasd_ioctl_information(struct block_device *bdev, int no, long args) dasd_info->cu_model = cdev->id.cu_model; dasd_info->dev_type = cdev->id.dev_type; dasd_info->dev_model = cdev->id.dev_model; - dasd_info->open_count = atomic_read(&device->open_count); dasd_info->status = device->state; + /* + * The open_count is increased for every opener, that includes + * the blkdev_get in dasd_scan_partitions. + * This must be hidden from user-space. + */ + dasd_info->open_count = atomic_read(&device->open_count); + if (!device->bdev) + dasd_info->open_count++; /* * check if device is really formatted