projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[deliverable/linux.git]
/
drivers
/
s390
/
block
/
dasd_ioctl.c
diff --git
a/drivers/s390/block/dasd_ioctl.c
b/drivers/s390/block/dasd_ioctl.c
index 478bcdb90b6fbb29b9afbc1a66e267c2200bd530..7039d9cf0fb4e22a6c557e857a2b785cf3f3d431 100644
(file)
--- a/
drivers/s390/block/dasd_ioctl.c
+++ b/
drivers/s390/block/dasd_ioctl.c
@@
-17,7
+17,7
@@
#include <linux/fs.h>
#include <linux/blkpg.h>
#include <linux/smp_lock.h>
#include <linux/fs.h>
#include <linux/blkpg.h>
#include <linux/smp_lock.h>
-
+#include <asm/compat.h>
#include <asm/ccwdev.h>
#include <asm/cmb.h>
#include <asm/uaccess.h>
#include <asm/ccwdev.h>
#include <asm/cmb.h>
#include <asm/uaccess.h>
@@
-260,7
+260,7
@@
static int dasd_ioctl_information(struct dasd_block *block,
struct ccw_dev_id dev_id;
base = block->base;
struct ccw_dev_id dev_id;
base = block->base;
- if (!base->discipline->fill_info)
+ if (!base->discipline
|| !base->discipline
->fill_info)
return -EINVAL;
dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
return -EINVAL;
dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
@@
-303,10
+303,7
@@
static int dasd_ioctl_information(struct dasd_block *block,
dasd_info->features |=
((base->features & DASD_FEATURE_READONLY) != 0);
dasd_info->features |=
((base->features & DASD_FEATURE_READONLY) != 0);
- if (base->discipline)
- memcpy(dasd_info->type, base->discipline->name, 4);
- else
- memcpy(dasd_info->type, "none", 4);
+ memcpy(dasd_info->type, base->discipline->name, 4);
if (block->request_queue->request_fn) {
struct list_head *l;
if (block->request_queue->request_fn) {
struct list_head *l;
@@
-358,9
+355,8
@@
dasd_ioctl_set_ro(struct block_device *bdev, void __user *argp)
}
static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,
}
static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,
-
unsigned long arg
)
+
struct cmbdata __user *argp
)
{
{
- struct cmbdata __user *argp = (void __user *) arg;
size_t size = _IOC_SIZE(cmd);
struct cmbdata data;
int ret;
size_t size = _IOC_SIZE(cmd);
struct cmbdata data;
int ret;
@@
-376,7
+372,12
@@
dasd_do_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
struct dasd_block *block = bdev->bd_disk->private_data;
unsigned int cmd, unsigned long arg)
{
struct dasd_block *block = bdev->bd_disk->private_data;
- void __user *argp = (void __user *)arg;
+ void __user *argp;
+
+ if (is_compat_task())
+ argp = compat_ptr(arg);
+ else
+ argp = (void __user *)arg;
if (!block)
return -ENODEV;
if (!block)
return -ENODEV;
@@
-414,7
+415,7
@@
dasd_do_ioctl(struct block_device *bdev, fmode_t mode,
case BIODASDCMFDISABLE:
return disable_cmf(block->base->cdev);
case BIODASDREADALLCMB:
case BIODASDCMFDISABLE:
return disable_cmf(block->base->cdev);
case BIODASDREADALLCMB:
- return dasd_ioctl_readall_cmb(block, cmd, arg);
+ return dasd_ioctl_readall_cmb(block, cmd, arg
p
);
default:
/* if the discipline has an ioctl method try it. */
if (block->base->discipline->ioctl) {
default:
/* if the discipline has an ioctl method try it. */
if (block->base->discipline->ioctl) {
This page took
0.027471 seconds
and
5
git commands to generate.