[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20121013090817.28574.26477.stgit@warthog.procyon.org.uk>
Date: Sat, 13 Oct 2012 10:08:17 +0100
From: David Howells <dhowells@...hat.com>
To: unlisted-recipients:; (no To-header on input)
Cc: linux-kernel@...r.kernel.org, David Howells <dhowells@...hat.com>,
Jens Axboe <jaxboe@...ionio.com>, Tejun Heo <tj@...nel.org>,
Al Viro <viro@...IV.linux.org.uk>
Subject: [PATCH 2/2] UAPI: Unexport linux/blk_types.h
It seems that was linux/blk_types.h incorrectly exported to fix up some missing
bits required by the exported parts of linux/fs.h (READ, WRITE, READA, etc.).
So unexport linux/blk_types.h and unexport the relevant bits of linux/fs.h.
Signed-off-by: David Howells <dhowells@...hat.com>
cc: Jens Axboe <jaxboe@...ionio.com>
cc: Tejun Heo <tj@...nel.org>
cc: Al Viro <viro@...IV.linux.org.uk>
---
include/linux/Kbuild | 1 -
include/linux/fs.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index d114db9..e2a1346 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -69,7 +69,6 @@ header-y += b1lli.h
header-y += baycom.h
header-y += bfs_fs.h
header-y += binfmts.h
-header-y += blk_types.h
header-y += blkpg.h
header-y += blktrace_api.h
header-y += bpqether.h
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 65fbf57..c83f45c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -117,6 +117,7 @@ struct inodes_stat_t {
/* File was opened by fanotify and shouldn't generate fanotify events */
#define FMODE_NONOTIFY ((__force fmode_t)0x1000000)
+#ifdef __KERNEL__
/*
* The below are the various read and write types that we support. Some of
* them include behavioral modifiers that send information down to the
@@ -175,6 +176,7 @@ struct inodes_stat_t {
#define WRITE_FUA (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FUA)
#define WRITE_FLUSH_FUA (WRITE | REQ_SYNC | REQ_NOIDLE | REQ_FLUSH | REQ_FUA)
+#endif /* __KERNEL__ */
/*
* Flag for rw_copy_check_uvector and compat_rw_copy_check_uvector
--
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/
Powered by blists - more mailing lists