[PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[David Howells]

From: David Howells <dhowells@redhat.com>

Make BSG function declarations dependent on CONFIG_BLOCK as they are not
compilable if the block layer is compiled out.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 include/linux/bsg.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index 102dc09..e917c41 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -47,6 +47,7 @@ struct sg_io_v4 {
 };
 
 #ifdef __KERNEL__
+#ifdef CONFIG_BLOCK
 
 #if defined(CONFIG_BLK_DEV_BSG)
 struct bsg_class_device {
@@ -68,6 +69,7 @@ static inline void bsg_unregister_queue(struct request_queue *rq)
 }
 #endif
 
+#endif /* CONFIG_BLOCK */
 #endif /* __KERNEL__ */
 
 #endif

Re: [PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[James Bottomley]

On Wed, 2007-08-01 at 10:13 +0100, David Howells wrote:
> From: David Howells <dhowells@redhat.com>
> 
> Make BSG function declarations dependent on CONFIG_BLOCK as they are not
> compilable if the block layer is compiled out.
> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> ---
> 
>  include/linux/bsg.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/bsg.h b/include/linux/bsg.h
> index 102dc09..e917c41 100644
> --- a/include/linux/bsg.h
> +++ b/include/linux/bsg.h
> @@ -47,6 +47,7 @@ struct sg_io_v4 {
>  };
>  
>  #ifdef __KERNEL__
> +#ifdef CONFIG_BLOCK
>  
>  #if defined(CONFIG_BLK_DEV_BSG)
>  struct bsg_class_device {
> @@ -68,6 +69,7 @@ static inline void bsg_unregister_queue(struct request_queue *rq)
>  }
>  #endif
>  
> +#endif /* CONFIG_BLOCK */
>  #endif /* __KERNEL__ */

Are you sure you're testing with git head?  CONFIG_BLK_DEV_BSG cannot be
set unless CONFIG_BLOCK is (which was a bug in previous releases now
fixed in git head ... unless the fix has gone wrong?).

James

Re: [PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[David Howells]

James Bottomley <James.Bottomley@SteelEye.com> wrote:

> Are you sure you're testing with git head?  CONFIG_BLK_DEV_BSG cannot be
> set unless CONFIG_BLOCK is (which was a bug in previous releases now
> fixed in git head ... unless the fix has gone wrong?).

Neither CONFIG_BLK_DEV_BSG nor CONFIG_BLOCK are set.  The problem is that the
stub BSG functions refer to undefined structures when CONFIG_BLOCK=n.

David

Re: [PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[James Bottomley]

On Wed, 2007-08-01 at 15:44 +0100, David Howells wrote:
> James Bottomley <James.Bottomley@SteelEye.com> wrote:
> 
> > Are you sure you're testing with git head?  CONFIG_BLK_DEV_BSG cannot be
> > set unless CONFIG_BLOCK is (which was a bug in previous releases now
> > fixed in git head ... unless the fix has gone wrong?).
> 
> Neither CONFIG_BLK_DEV_BSG nor CONFIG_BLOCK are set.  The problem is that the
> stub BSG functions refer to undefined structures when CONFIG_BLOCK=n.

Hmm, then isn't the fix to add a struct request_queue; and other
definitions above the stub functions?

What is the file that's causing this actual problem ... as in what still
needs to pull in the block headers if CONFIG_BLOCK=n (or more properly,
could it also need to use the bsg stub functions?)

James

[PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[David Howells]

From: David Howells <dhowells@redhat.com>

Make BSG function declarations dependent on CONFIG_BLOCK as they are not
compilable if the block layer is compiled out.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 include/linux/bsg.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index 60e377b..28f5d44 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -52,6 +52,7 @@ struct sg_io_v4 {
 };
 
 #ifdef __KERNEL__
+#ifdef CONFIG_BLOCK
 
 #if defined(CONFIG_BLK_DEV_BSG)
 struct bsg_class_device {
@@ -73,6 +74,7 @@ static inline void bsg_unregister_queue(struct request_queue *rq)
 }
 #endif
 
+#endif /* CONFIG_BLOCK */
 #endif /* __KERNEL__ */
 
 #endif

Re: [PATCH] FRV: Make BSG declarations dependent on CONFIG_BLOCK

[Jens Axboe]

On Wed, Sep 05 2007, David Howells wrote:
> From: David Howells <dhowells@redhat.com>
> 
> Make BSG function declarations dependent on CONFIG_BLOCK as they are not
> compilable if the block layer is compiled out.
> 
> Signed-off-by: David Howells <dhowells@redhat.com>

Thanks David, I did seem to have lost it. Will apply!

-- 
Jens Axboe