2007-11-19 22:09:37

by Mike Miller

Subject: [PATCH 2/3] cciss: add support for blktrace

Patch 2 of 3
This patch adds support for the blktrace utility. Please consider this for
inclusion. Seems there was already a call to blk_add_trace. This patch adds
ifdef's and includes the header file.

Signed-off-by: Mike Miller <[email protected]>


diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 2ba5a89..61bc0f3 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -41,6 +41,10 @@
#include <asm/uaccess.h>
#include <asm/io.h>

+#ifdef CONFIG_BLK_DEV_IO_TRACE
+#include <linux/blktrace_api.h>
+#endif /* CONFIG_BLK_DEV_IO_TRACE */
+
#include <linux/dma-mapping.h>
#include <linux/blkdev.h>
#include <linux/genhd.h>
@@ -3013,7 +3017,9 @@ after_error_processing:
}
cmd->rq->data_len = 0;
cmd->rq->completion_data = cmd;
+#ifdef CONFIG_BLK_DEV_IO_TRACE
blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE);
+#endif /* CONFIG_BLK_DEV_IO_TRACE */
blk_complete_request(cmd->rq);
}

2007-11-20 07:56:23

by Andrew Morton

Subject: Re: [PATCH 2/3] cciss: add support for blktrace

On Mon, 19 Nov 2007 16:07:17 -0600 Mike Miller <[email protected]> wrote:

> Patch 2 of 3
> This patch adds support for the blktrace utility. Please consider this for
> inclusion. Seems there was already a call to blk_add_trace. This patch adds
> ifdef's and includes the header file.
>
> Signed-off-by: Mike Miller <[email protected]>
>
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 2ba5a89..61bc0f3 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -41,6 +41,10 @@
> #include <asm/uaccess.h>
> #include <asm/io.h>
>
> +#ifdef CONFIG_BLK_DEV_IO_TRACE
> +#include <linux/blktrace_api.h>
> +#endif /* CONFIG_BLK_DEV_IO_TRACE */

The ifdefs shouldn't be needed here. If they are needed, blktrace_api.h needs
fixing.

> #include <linux/dma-mapping.h>
> #include <linux/blkdev.h>
> #include <linux/genhd.h>
> @@ -3013,7 +3017,9 @@ after_error_processing:
> }
> cmd->rq->data_len = 0;
> cmd->rq->completion_data = cmd;
> +#ifdef CONFIG_BLK_DEV_IO_TRACE
> blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE);
> +#endif /* CONFIG_BLK_DEV_IO_TRACE */
> blk_complete_request(cmd->rq);
> }

Add if you remove the first set of ifdefs, these ifdefs can also be
removed.

2007-11-20 08:35:29

by Jens Axboe

Subject: Re: [PATCH 2/3] cciss: add support for blktrace

On Mon, Nov 19 2007, Mike Miller wrote:
> Patch 2 of 3
> This patch adds support for the blktrace utility. Please consider this for
> inclusion. Seems there was already a call to blk_add_trace. This patch adds
> ifdef's and includes the header file.
>
> Signed-off-by: Mike Miller <[email protected]>
>
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> index 2ba5a89..61bc0f3 100644
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -41,6 +41,10 @@
> #include <asm/uaccess.h>
> #include <asm/io.h>
>
> +#ifdef CONFIG_BLK_DEV_IO_TRACE
> +#include <linux/blktrace_api.h>
> +#endif /* CONFIG_BLK_DEV_IO_TRACE */
> +
> #include <linux/dma-mapping.h>
> #include <linux/blkdev.h>
> #include <linux/genhd.h>
> @@ -3013,7 +3017,9 @@ after_error_processing:
> }
> cmd->rq->data_len = 0;
> cmd->rq->completion_data = cmd;
> +#ifdef CONFIG_BLK_DEV_IO_TRACE
> blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE);
> +#endif /* CONFIG_BLK_DEV_IO_TRACE */
> blk_complete_request(cmd->rq);
> }

Puzzled by this patch... What is it trying to achieve?

--
Jens Axboe