diff options
author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-02-16 18:59:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 20:56:04 -0500 |
commit | 6cd176a51e52e5218b1aa97e1ec916bac25a9b7e (patch) | |
tree | aa4154016ecea4e63ab0dda6e00ada1d718d31df /include/linux/fs.h | |
parent | 07642381d5ad800d021bb80842bfebb100b12fc2 (diff) |
vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX
The fewer Kconfig options we have the better. Use the generic
CONFIG_FS_DAX to enable XIP support in ext2 as well as in the core.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 9772d655f444..d46f8fe6a0ea 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1676,7 +1676,7 @@ struct super_operations { | |||
1676 | #define S_IMA 1024 /* Inode has an associated IMA struct */ | 1676 | #define S_IMA 1024 /* Inode has an associated IMA struct */ |
1677 | #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */ | 1677 | #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */ |
1678 | #define S_NOSEC 4096 /* no suid or xattr security attributes */ | 1678 | #define S_NOSEC 4096 /* no suid or xattr security attributes */ |
1679 | #ifdef CONFIG_FS_XIP | 1679 | #ifdef CONFIG_FS_DAX |
1680 | #define S_DAX 8192 /* Direct Access, avoiding the page cache */ | 1680 | #define S_DAX 8192 /* Direct Access, avoiding the page cache */ |
1681 | #else | 1681 | #else |
1682 | #define S_DAX 0 /* Make all the DAX code disappear */ | 1682 | #define S_DAX 0 /* Make all the DAX code disappear */ |