diff options
author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-19 12:12:19 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-19 12:12:19 -0400 |
commit | 16c0cfa425b8e1488f7a1873bd112a7a099325f0 (patch) | |
tree | eeba5728a8072096279c55ffc10a5ca7ac0ddf05 /fs/super.c | |
parent | 94574d9a4c236e8bd19721b4adb0ea30ef446901 (diff) | |
parent | 072611ed1f291053a74b28b813d683a09495eba7 (diff) |
Merge branch 'stable/cleancache.v13' into linux-next
* stable/cleancache.v13:
mm: cleancache: Use __read_mostly as appropiate.
mm: cleancache: report statistics via debugfs instead of sysfs.
mm: zcache/tmem/cleancache: s/flush/invalidate/
mm: cleancache: s/flush/invalidate/
Diffstat (limited to 'fs/super.c')
-rw-r--r-- | fs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index 6277ec6cb60a..fe5a7b3a1134 100644 --- a/fs/super.c +++ b/fs/super.c | |||
@@ -250,7 +250,7 @@ void deactivate_locked_super(struct super_block *s) | |||
250 | { | 250 | { |
251 | struct file_system_type *fs = s->s_type; | 251 | struct file_system_type *fs = s->s_type; |
252 | if (atomic_dec_and_test(&s->s_active)) { | 252 | if (atomic_dec_and_test(&s->s_active)) { |
253 | cleancache_flush_fs(s); | 253 | cleancache_invalidate_fs(s); |
254 | fs->kill_sb(s); | 254 | fs->kill_sb(s); |
255 | 255 | ||
256 | /* caches are now gone, we can safely kill the shrinker now */ | 256 | /* caches are now gone, we can safely kill the shrinker now */ |