diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 14:36:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-23 14:36:03 +1100 |
| commit | 9e4bf51bbe52e0484a63898c0e112207d993143e (patch) | |
| tree | d6f7db1d097fc2689f7ec5e4704670e1e285d42b /fs/ocfs2/super.c | |
| parent | e32da6a834c292e5e64ca24c9c2bb5438972bc0c (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
Diffstat (limited to 'fs/ocfs2/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 236ed1bdca2c..8548a5091527 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -41,6 +41,7 @@ #include <linux/mount.h> #include <linux/seq_file.h> #include <linux/quotaops.h> +#include <linux/cleancache.h> #define MLOG_MASK_PREFIX ML_SUPER #include <cluster/masklog.h> @@ -2378,6 +2379,7 @@ static int ocfs2_initialize_super(struct super_block *sb, mlog_errno(status); goto bail; } + cleancache_init_shared_fs((char *)&uuid_net_key, sb); bail: mlog_exit(status); |