diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:24:24 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 16:24:24 -0800 |
commit | cec6062037783a762aa5606b06b8bc5c14d9657f (patch) | |
tree | c862659eb55e44314f6d524f5479204994b91901 /block/ioctl.c | |
parent | 88f07ffb63add018bfafd480ec6a294088277f06 (diff) | |
parent | 2056a782f8e7e65fd4bfd027506b4ce1c5e9ccd4 (diff) |
Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23
[PATCH] relay: consolidate sendfile() and read() code
[PATCH] relay: add sendfile() support
[PATCH] relay: migrate from relayfs to a generic relay API
Diffstat (limited to 'block/ioctl.c')
-rw-r--r-- | block/ioctl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 35fdb7dc651..9cfa2e1ecb2 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -5,6 +5,7 @@ #include <linux/backing-dev.h> #include <linux/buffer_head.h> #include <linux/smp_lock.h> +#include <linux/blktrace_api.h> #include <asm/uaccess.h> static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user *arg) @@ -189,6 +190,11 @@ static int blkdev_locked_ioctl(struct file *file, struct block_device *bdev, return put_ulong(arg, bdev->bd_inode->i_size >> 9); case BLKGETSIZE64: return put_u64(arg, bdev->bd_inode->i_size); + case BLKTRACESTART: + case BLKTRACESTOP: + case BLKTRACESETUP: + case BLKTRACETEARDOWN: + return blk_trace_ioctl(bdev, cmd, (char __user *) arg); } return -ENOIOCTLCMD; } |