diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2015-02-16 18:59:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 20:56:04 -0500 |
commit | 923ae0ff9250430133b3310fe62c47538cf1cbc1 (patch) | |
tree | 3c4194cbedbe77e719bf7c8762fba5362ec26032 /fs/ext4/ext4.h | |
parent | 25726bc15731d42112b579cf73f30edbc43d3973 (diff) |
ext4: add DAX functionality
This is a port of the DAX functionality found in the current version of
ext2.
[matthew.r.wilcox@intel.com: heavily tweaked]
[akpm@linux-foundation.org: remap_pages went away]
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@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: 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 'fs/ext4/ext4.h')
-rw-r--r-- | fs/ext4/ext4.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a75fba67bb1f..982d934fd9ac 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -965,6 +965,11 @@ struct ext4_inode_info { | |||
965 | #define EXT4_MOUNT_ERRORS_MASK 0x00070 | 965 | #define EXT4_MOUNT_ERRORS_MASK 0x00070 |
966 | #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ | 966 | #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ |
967 | #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ | 967 | #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ |
968 | #ifdef CONFIG_FS_DAX | ||
969 | #define EXT4_MOUNT_DAX 0x00200 /* Direct Access */ | ||
970 | #else | ||
971 | #define EXT4_MOUNT_DAX 0 | ||
972 | #endif | ||
968 | #define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */ | 973 | #define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */ |
969 | #define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */ | 974 | #define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */ |
970 | #define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */ | 975 | #define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */ |
@@ -2578,6 +2583,7 @@ extern const struct file_operations ext4_dir_operations; | |||
2578 | /* file.c */ | 2583 | /* file.c */ |
2579 | extern const struct inode_operations ext4_file_inode_operations; | 2584 | extern const struct inode_operations ext4_file_inode_operations; |
2580 | extern const struct file_operations ext4_file_operations; | 2585 | extern const struct file_operations ext4_file_operations; |
2586 | extern const struct file_operations ext4_dax_file_operations; | ||
2581 | extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin); | 2587 | extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin); |
2582 | 2588 | ||
2583 | /* inline.c */ | 2589 | /* inline.c */ |