diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
| commit | 3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch) | |
| tree | d40ab1904047d2db03c9f6e9b538e01d62415646 /fs/ext4/super.c | |
| parent | efdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff) | |
| parent | 06a691e64b11323a735db3c3bd909d3c0712698f (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 753f4e68b820..c9ab67da6e5a 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1664,8 +1664,12 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, } sbi->s_jquota_fmt = m->mount_opt; #endif -#ifndef CONFIG_FS_DAX } else if (token == Opt_dax) { +#ifdef CONFIG_FS_DAX + ext4_msg(sb, KERN_WARNING, + "DAX enabled. Warning: EXPERIMENTAL, use at your own risk"); + sbi->s_mount_opt |= m->mount_opt; +#else ext4_msg(sb, KERN_INFO, "dax option not supported"); return -1; #endif |