Merge remote-tracking branch 'cleancache/linux-next'

Conflicts:
	fs/ocfs2/super.c
	fs/super.c
	include/linux/fs.h
	mm/Kconfig
	mm/truncate.c

1 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 1b95af37e3b3..3adf033882b2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1430,6 +1430,11 @@ struct super_block {
 	 */
 	char __rcu *s_options;
 	const struct dentry_operations *s_d_op; /* default d_op for dentries */
+
+	/*
+	 * Saved pool identifier for cleancache (-1 means none)
+	 */
+	int cleancache_poolid;
 };
 
 extern struct timespec current_fs_time(struct super_block *sb);