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 | |
| parent | 94574d9a4c236e8bd19721b4adb0ea30ef446901 (diff) | |
| parent | 072611ed1f291053a74b28b813d683a09495eba7 (diff) | |
| download | linux-16c0cfa425b8e1488f7a1873bd112a7a099325f0.tar.gz linux-16c0cfa425b8e1488f7a1873bd112a7a099325f0.tar.bz2 linux-16c0cfa425b8e1488f7a1873bd112a7a099325f0.zip | |
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')
| -rw-r--r-- | fs/block_dev.c | 2 | ||||
| -rw-r--r-- | fs/super.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 5e9f198f7712..a9ff3000b83d 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -109,7 +109,7 @@ void invalidate_bdev(struct block_device *bdev) /* 99% of the time, we don't need to flush the cleancache on the bdev. * But, for the strange corners, lets be cautious */ - cleancache_flush_inode(mapping); + cleancache_invalidate_inode(mapping); } EXPORT_SYMBOL(invalidate_bdev); 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) { struct file_system_type *fs = s->s_type; if (atomic_dec_and_test(&s->s_active)) { - cleancache_flush_fs(s); + cleancache_invalidate_fs(s); fs->kill_sb(s); /* caches are now gone, we can safely kill the shrinker now */ |