diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-07 16:51:26 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:26:08 +0200 |
| commit | 62c2a7d969f30163f733c81158254b3095b23e72 (patch) | |
| tree | 3e5dd79d874b996757814562b874a18415599a61 /include/linux | |
| parent | 6e9624b8caec290d28b4c6d9ec75749df6372b87 (diff) | |
| download | linux-62c2a7d969f30163f733c81158254b3095b23e72.tar.gz linux-62c2a7d969f30163f733c81158254b3095b23e72.tar.bz2 linux-62c2a7d969f30163f733c81158254b3095b23e72.zip | |
block: push BKL into blktrace ioctls
The blktrace driver currently needs the BKL, but
we should not need to take that in the block layer,
so just push it down into the driver itself.
It is quite likely that the BKL is not actually
required in blktrace code and could be removed
in a follow-on patch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blktrace_api.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 23faa67e8022..07c698621ad0 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -5,6 +5,7 @@ #ifdef __KERNEL__ #include <linux/blkdev.h> #include <linux/relay.h> +#include <linux/compat.h> #endif /* @@ -203,6 +204,17 @@ extern int blk_trace_init_sysfs(struct device *dev); extern struct attribute_group blk_trace_attr_group; +struct compat_blk_user_trace_setup { + char name[32]; + u16 act_mask; + u32 buf_size; + u32 buf_nr; + compat_u64 start_lba; + compat_u64 end_lba; + u32 pid; +}; +#define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup) + #else /* !CONFIG_BLK_DEV_IO_TRACE */ # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) # define blk_trace_shutdown(q) do { } while (0) |