Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: Linux: Kernel

linux-next: build failure after merge of the block tree

 

 

Linux kernel RSS feed   Index | Next | Previous | View Threaded


sfr at canb

Aug 2, 2010, 8:12 PM

Post #1 of 7 (1093 views)
Permalink
linux-next: build failure after merge of the block tree

Hi Jens,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/ceph/rbd.c: In function 'rbd_rq_fn':
fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_fs_request'
fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_barrier_rq'

Caused by commit fc734ac98dbce1e3d3e1e1359524c279a336ac49 ("block: remove
wrappers for request type/flags") interacting with commit
e7fdb915217126d23ff2aafb2d5fdce21b763df1 ("ceph-rbd: rados block device")
from the ceph tree.

I applied the following merge fix patch (Christoph, I assume that this
should be directly applicable to the ceph tree, right?):

From: Stephen Rothwell <sfr [at] canb>
Date: Tue, 3 Aug 2010 13:08:18 +1000
Subject: [PATCH] ceph: update for removal of request flag wrappers

Signed-off-by: Stephen Rothwell <sfr [at] canb>
---
fs/ceph/rbd.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/ceph/rbd.c b/fs/ceph/rbd.c
index 86c8b06..1fa2634 100644
--- a/fs/ceph/rbd.c
+++ b/fs/ceph/rbd.c
@@ -1098,7 +1098,8 @@ static void rbd_rq_fn(struct request_queue *q)
dout("fetched request\n");

/* filter out block requests we don't understand */
- if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
+ if ((rq->cmd_type != REQ_TYPE_FS) &&
+ !(rq->cmd_flags & REQ_HARDBARRIER)) {
__blk_end_request_all(rq, 0);
goto next;
}
--
1.7.1

--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/


axboe at kernel

Aug 3, 2010, 12:46 AM

Post #2 of 7 (1045 views)
Permalink
Re: linux-next: build failure after merge of the block tree [In reply to]

On 2010-08-03 05:12, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/ceph/rbd.c: In function 'rbd_rq_fn':
> fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_fs_request'
> fs/ceph/rbd.c:1101: error: implicit declaration of function 'blk_barrier_rq'
>
> Caused by commit fc734ac98dbce1e3d3e1e1359524c279a336ac49 ("block: remove
> wrappers for request type/flags") interacting with commit
> e7fdb915217126d23ff2aafb2d5fdce21b763df1 ("ceph-rbd: rados block device")
> from the ceph tree.
>
> I applied the following merge fix patch (Christoph, I assume that this
> should be directly applicable to the ceph tree, right?):

Yep, that'll work and should be applicable to ceph even when run outside
of the block tree merge.

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/


hch at lst

Aug 3, 2010, 1:26 AM

Post #3 of 7 (1048 views)
Permalink
Re: linux-next: build failure after merge of the block tree [In reply to]

On Tue, Aug 03, 2010 at 01:12:02PM +1000, Stephen Rothwell wrote:
> I applied the following merge fix patch (Christoph, I assume that this
> should be directly applicable to the ceph tree, right?):

Yes, it looks good.

> - if (!blk_fs_request(rq) && !blk_barrier_rq(rq)) {
> + if ((rq->cmd_type != REQ_TYPE_FS) &&
> + !(rq->cmd_flags & REQ_HARDBARRIER)) {
> __blk_end_request_all(rq, 0);
> goto next;

Although these days barriers are REQ_TYPE_FS anyway, so the second check
is superflous.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/


sfr at canb

Aug 4, 2010, 6:47 PM

Post #4 of 7 (1043 views)
Permalink
linux-next: build failure after merge of the block tree [In reply to]

Hi Jens,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

usr/include/linux/fs.h:11: included file 'linux/blk_types.h' is not exported

Caused by commit 9d3dbbcd9a84518ff5e32ffe671d06a48cf84fd9 ("bio, fs:
separate out bio_types.h and define READ/WRITE constants in terms of
BIO_RW_* flags").

I used the block tree from next-20100804 for today.
--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/


axboe at kernel

Aug 4, 2010, 11:35 PM

Post #5 of 7 (1043 views)
Permalink
Re: linux-next: build failure after merge of the block tree [In reply to]

On 2010-08-05 03:47, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> usr/include/linux/fs.h:11: included file 'linux/blk_types.h' is not exported
>
> Caused by commit 9d3dbbcd9a84518ff5e32ffe671d06a48cf84fd9 ("bio, fs:
> separate out bio_types.h and define READ/WRITE constants in terms of
> BIO_RW_* flags").
>
> I used the block tree from next-20100804 for today.

Thanks Stephen, I fixed this one up now and pushed it out.

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/


sfr at canb

Aug 8, 2010, 6:28 PM

Post #6 of 7 (1028 views)
Permalink
linux-next: build failure after merge of the block tree [In reply to]

Hi Jens,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/block/xen-blkfront.c: In function 'blkif_release':
drivers/block/xen-blkfront.c:1238: error: label 'out' used but not defined

Caused by commit acfca3c622a009fb62b566604452ab9fb3a11019 ("blkfront:
Remove obsolete info->users"). I assume something went wrong in the
rebase ...

I have used the block tree from next-20100807 for today.
--
Cheers,
Stephen Rothwell sfr [at] canb
http://www.canb.auug.org.au/~sfr/


axboe at kernel

Aug 8, 2010, 6:50 PM

Post #7 of 7 (1029 views)
Permalink
Re: linux-next: build failure after merge of the block tree [In reply to]

On 08/08/2010 09:28 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/block/xen-blkfront.c: In function 'blkif_release':
> drivers/block/xen-blkfront.c:1238: error: label 'out' used but not defined
>
> Caused by commit acfca3c622a009fb62b566604452ab9fb3a11019 ("blkfront:
> Remove obsolete info->users"). I assume something went wrong in the
> rebase ...
>
> I have used the block tree from next-20100807 for today.

Oops, fixed up.

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Linux kernel RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.