diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
| commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
| tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /fs/ext4/super.c | |
| parent | 9b1b61cd8e31d9beba871333d7a798b3adb89288 (diff) | |
| parent | 29f5b34ca1a191c2cf4f6c8c12f4dec56e8d3bc1 (diff) | |
| download | linux-970259bff472579204108c6f27036ec4d1206ae1.tar.bz2 | |
Merge branch '81xx' into omap-for-v4.4/fixes
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 |