summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-10-01 16:16:25 +0200
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 08:56:20 +0200
commit0497b345e7d067109e0dd9bf9f4978a6847ee13b (patch)
tree8c181a200c9e883a9c85169dff887bfb9109ee5e /include/linux
parentef9e3facdf1fe1228721a7c295a76d1b7a0e57ec (diff)
downloadlinux-stable-0497b345e7d067109e0dd9bf9f4978a6847ee13b.tar.gz
linux-stable-0497b345e7d067109e0dd9bf9f4978a6847ee13b.tar.bz2
linux-stable-0497b345e7d067109e0dd9bf9f4978a6847ee13b.zip
blktrace: use BLKTRACE_BDEV_SIZE as the name size for setup structure
Define as 32, which is is what BDEVNAME_SIZE is/was as well. This keeps the user interface the same and gets rid of the difference between kernel and user api here. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blktrace_api.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index a2a7d0ca2758..3a31eb506164 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -122,15 +122,13 @@ enum {
Blktrace_stopped,
};
+#define BLKTRACE_BDEV_SIZE 32
+
/*
* User setup structure passed with BLKTRACESTART
*/
struct blk_user_trace_setup {
-#ifdef __KERNEL__
- char name[BDEVNAME_SIZE]; /* output */
-#else
- char name[32]; /* output */
-#endif
+ char name[BLKTRACE_BDEV_SIZE]; /* output */
__u16 act_mask; /* input */
__u32 buf_size; /* input */
__u32 buf_nr; /* input */