diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-17 15:18:24 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-17 15:18:24 +1100 |
commit | 4ce7e1767c00d18910359fdd596d7bef3e3b6718 (patch) | |
tree | 12cd16e96bf80f4f25a56ad13909494ef727d99e /include/linux/fs.h | |
parent | 368d72fbdeba09fb2b80ee7494fbfaa056aacdcd (diff) | |
parent | 5231e92e133d6db6681a4485b1794a01469ca9ad (diff) |
Merge remote branch 'cleancache/linux-next'
Conflicts:
fs/ocfs2/super.c
fs/super.c
include/linux/fs.h
mm/Kconfig
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index bd3215940c37..11463e2fd305 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1426,6 +1426,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); |