X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fcompat_ioctl.c;h=1e559fba7bdfc58859605b0d9fdc879346f86b07;hb=be3c096ebdbe3c828aacb5473751a22840753eff;hp=c70d0b6f666fff96feb69f97fe9ed30e2990fa19;hpb=e43fe686e48835ca027559a068bbe0b6d264a254;p=linux-2.6-omap-h63xx.git

diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index c70d0b6f666..1e559fba7bd 100644
--- 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;
 
-	strcpy(b, bdevname(bdev, b));
+	bdevname(bdev, b);
 
 	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:
+	case BLKDISCARD:
 	/*
 	 * the ones below are implemented in blkdev_locked_ioctl,
 	 * but we call blkdev_ioctl, which gets the lock for us