diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-29 12:21:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-29 12:21:54 +1100 |
| commit | 55370d915f51ace5b36db293dc0401ced82b8d74 (patch) | |
| tree | 23677d2a0c5b36becebd4ed892a8e7f3f59c4ffe /fs/ext4/super.c | |
| parent | 376b85562f93b62c3009c8432c9754aa3c924f70 (diff) | |
| parent | 5231e92e133d6db6681a4485b1794a01469ca9ad (diff) | |
Merge remote-tracking branch 'cleancache/linux-next'
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
mm/truncate.c
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 22546ad7f0ae..834cc97cfa19 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -38,6 +38,7 @@ #include <linux/ctype.h> #include <linux/log2.h> #include <linux/crc16.h> +#include <linux/cleancache.h> #include <asm/uaccess.h> #include <linux/kthread.h> @@ -1915,6 +1916,7 @@ static int ext4_setup_super(struct super_block *sb, struct ext4_super_block *es, EXT4_INODES_PER_GROUP(sb), sbi->s_mount_opt, sbi->s_mount_opt2); + cleancache_init_fs(sb); return res; } |