linux-kernel - -tip: block, fuse: Fix build error in fs/fuse/dev.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090711075201.GA6517@elte.hu>
Date:	Sat, 11 Jul 2009 09:52:01 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Jens Axboe <jens.axboe@...cle.com>,
	Miklos Szeredi <miklos@...redi.hu>
Cc:	linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: -tip: block, fuse: Fix build error in fs/fuse/dev.c

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@...cle.com>
Cc: Miklos Szeredi <mszeredi@...e.cz>
Signed-off-by: Ingo Molnar <mingo@...e.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

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