aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2010-08-17 18:23:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-17 21:33:11 -0400
commit602586a83b719df0fbd94196a1359ed35aeb2df3 (patch)
tree1ff381d77769e352397edd2f6a7aa8ca5ba929f1 /mm/shmem.c
parent19147d0eb1472eac690a9a708893d4de096bbfcf (diff)
shmem: put_super must percpu_counter_destroy
list_add() corruption messages reported from shmem_fill_super()'s recently introduced percpu_counter_init(): shmem_put_super() needs to remember to percpu_counter_destroy(). And also check error from percpu_counter_init(). Reported-bisected-and-tested-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Signed-off-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index dfaa0f4e9789..080b09a57a8f 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2325,7 +2325,10 @@ static int shmem_show_options(struct seq_file *seq, struct vfsmount *vfs)
2325 2325
2326static void shmem_put_super(struct super_block *sb) 2326static void shmem_put_super(struct super_block *sb)
2327{ 2327{
2328 kfree(sb->s_fs_info); 2328 struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
2329
2330 percpu_counter_destroy(&sbinfo->used_blocks);
2331 kfree(sbinfo);
2329 sb->s_fs_info = NULL; 2332 sb->s_fs_info = NULL;
2330} 2333}
2331 2334
@@ -2367,7 +2370,8 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
2367#endif 2370#endif
2368 2371
2369 spin_lock_init(&sbinfo->stat_lock); 2372 spin_lock_init(&sbinfo->stat_lock);
2370 percpu_counter_init(&sbinfo->used_blocks, 0); 2373 if (percpu_counter_init(&sbinfo->used_blocks, 0))
2374 goto failed;
2371 sbinfo->free_inodes = sbinfo->max_inodes; 2375 sbinfo->free_inodes = sbinfo->max_inodes;
2372 2376
2373 sb->s_maxbytes = SHMEM_MAX_BYTES; 2377 sb->s_maxbytes = SHMEM_MAX_BYTES;