projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel
[deliverable/linux.git]
/
block
/
compat_ioctl.c
diff --git
a/block/compat_ioctl.c
b/block/compat_ioctl.c
index c70d0b6f666fff96feb69f97fe9ed30e2990fa19..1e559fba7bdfc58859605b0d9fdc879346f86b07 100644
(file)
--- a/
block/compat_ioctl.c
+++ b/
block/compat_ioctl.c
@@
-555,7
+555,7
@@
static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
if (copy_from_user(&cbuts, arg, sizeof(cbuts)))
return -EFAULT;
if (copy_from_user(&cbuts, arg, sizeof(cbuts)))
return -EFAULT;
-
strcpy(b, bdevname(bdev, b)
);
+
bdevname(bdev, b
);
buts = (struct blk_user_trace_setup) {
.act_mask = cbuts.act_mask,
buts = (struct blk_user_trace_setup) {
.act_mask = cbuts.act_mask,
@@
-788,6
+788,7
@@
long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
return compat_hdio_getgeo(disk, bdev, compat_ptr(arg));
case BLKFLSBUF:
case BLKROSET:
return compat_hdio_getgeo(disk, bdev, compat_ptr(arg));
case BLKFLSBUF:
case BLKROSET:
+ case BLKDISCARD:
/*
* the ones below are implemented in blkdev_locked_ioctl,
* but we call blkdev_ioctl, which gets the lock for us
/*
* the ones below are implemented in blkdev_locked_ioctl,
* but we call blkdev_ioctl, which gets the lock for us
This page took
0.070226 seconds
and
5
git commands to generate.