Messages in this thread | | | Date | Sat, 11 Jul 2009 13:10:40 +0200 | From | Ingo Molnar <> | Subject | Re: -tip: block, fuse: Fix build error in fs/fuse/dev.c |
| |
* Jean Delvare <khali@linux-fr.org> wrote:
> Hi Ingo, > > On Sat, 11 Jul 2009 09:52:01 +0200, Ingo Molnar wrote: > > Today's upstream tree build (x86, 64-bit, allnoconfig+CONFIG_FUSE) > > failed with this build error: > > > > fs/fuse/dev.c: In function ‘request_end’: > > fs/fuse/dev.c:290: error: ‘BLK_RW_SYNC’ undeclared (first use in this function) > > fs/fuse/dev.c:290: error: (Each undeclared identifier is reported only once > > fs/fuse/dev.c:290: error: for each function it appears in.) > > fs/fuse/dev.c:291: error: ‘BLK_RW_ASYNC’ undeclared (first use in this function) > > > > Due to commit: > > > > 8aa7e84: Fix congestion_wait() sync/async vs read/write confusion > > > > Creating a dependency of BDI callbacks on the BLK_RW_* constants, > > while those constants are only defined if CONFIG_BLOCK is enabled. > > > > Fix it the simplest way for now, by moving the definitions early > > in blkdev.h (this cannot break anything), but the real fix would > > be to split up blkdev.h into blkdev-types.h and blkdev-api.h and > > make only the API definitions/declarations dependent on > > CONFIG_BLOCK. > > > > Cc: Jens Axboe <jens.axboe@oracle.com> > > Cc: Miklos Szeredi <mszeredi@suse.cz> > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > > --- > > include/linux/blkdev.h | 13 ++++++++----- > > 1 files changed, 8 insertions(+), 5 deletions(-) > > > > diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h > > index 49ae079..a3cdc6d 100644 > > --- a/include/linux/blkdev.h > > +++ b/include/linux/blkdev.h > > @@ -1,6 +1,14 @@ > > #ifndef _LINUX_BLKDEV_H > > #define _LINUX_BLKDEV_H > > > > +/* > > + * Definitions used on the !CONFIG_BLOCK case too: > > + */ > > +enum { > > + BLK_RW_ASYNC = 0, > > + BLK_RW_SYNC = 1, > > +}; > > + > > #ifdef CONFIG_BLOCK > > > > #include <linux/sched.h> > > @@ -70,11 +78,6 @@ enum rq_cmd_type_bits { > > REQ_TYPE_ATA_PC, > > }; > > > > -enum { > > - BLK_RW_ASYNC = 0, > > - BLK_RW_SYNC = 1, > > -}; > > - > > /* > > * For request of type REQ_TYPE_LINUX_BLOCK, rq->cmd[0] is the opcode being > > * sent down (similar to how REQ_TYPE_BLOCK_PC means that ->cmd[] holds a > > I have hit this build issue as well, but with CONFIG_BLOCK=y, so > the patch above does NOT fix it. The problem I see is that > fs/fuse/dev.c does not include <linux/blkdev.h> so it doesn't get > the definitions regardless of the configuration. Same problem in > fs/nfs/write.c. The patch below fixes it for me:
Yes, that's a different build bug already fixed in latest upstream:
097041e: fuse: Fix build error
Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |