diff options
author | Horst Hummel <horst.hummel@de.ibm.com> | 2006-01-06 03:19:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:50 -0500 |
commit | 9a7af289660dc749d7c58234191601046a9bf488 (patch) | |
tree | d32057111e48c3463a87dd3a051c44064eeb86fc /drivers/s390 | |
parent | cfb1b55595a0dfd87b5849e8d0216c029f34445f (diff) |
[PATCH] s390: BIODASDPRRD ioctl return code
The IOCTL BIODASDPRRD had no return code for 'profiling is inactive' and
therefore tunedasd wrote misleading message for request-counter = 0.
Introduce return-code EIO for inactive profiling.
Signed-off-by: Horst Hummel <horst.hummel@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 789595b3fa09..044b75371990 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Bugreports.to..: <Linux390@de.ibm.com> | 7 | * Bugreports.to..: <Linux390@de.ibm.com> |
8 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 | 8 | * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999-2001 |
9 | * | 9 | * |
10 | * $Revision: 1.47 $ | 10 | * $Revision: 1.50 $ |
11 | * | 11 | * |
12 | * i/o controls for the dasd driver. | 12 | * i/o controls for the dasd driver. |
13 | */ | 13 | */ |
@@ -352,6 +352,9 @@ dasd_ioctl_read_profile(struct block_device *bdev, int no, long args) | |||
352 | if (device == NULL) | 352 | if (device == NULL) |
353 | return -ENODEV; | 353 | return -ENODEV; |
354 | 354 | ||
355 | if (dasd_profile_level == DASD_PROFILE_OFF) | ||
356 | return -EIO; | ||
357 | |||
355 | if (copy_to_user((long __user *) args, (long *) &device->profile, | 358 | if (copy_to_user((long __user *) args, (long *) &device->profile, |
356 | sizeof (struct dasd_profile_info_t))) | 359 | sizeof (struct dasd_profile_info_t))) |
357 | return -EFAULT; | 360 | return -EFAULT; |