From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Jens Axboe <jens.axboe@oracle.com>,
Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>
Subject: -tip: block, fuse: Fix build error in fs/fuse/dev.c
Date: Sat, 11 Jul 2009 09:52:01 +0200 [thread overview]
Message-ID: <20090711075201.GA6517@elte.hu> (raw)
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
next reply other threads:[~2009-07-11 7:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-11 7:52 Ingo Molnar [this message]
2009-07-11 10:43 ` -tip: block, fuse: Fix build error in fs/fuse/dev.c Jean Delvare
2009-07-11 11:10 ` Ingo Molnar
2009-07-11 11:50 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090711075201.GA6517@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=jens.axboe@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox