From e477bdb10682059f0d92edcbc3ab5d47cfb617a4 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Mon, 21 Sep 2009 17:03:50 -0700 Subject: [PATCH] --- yaml --- r: 164487 b: refs/heads/master c: 425fbf047cc70bb30dff368a6da02c8c2d229318 h: refs/heads/master i: 164485: 651629e0b4929d6d22f328da0961ad68c93999af 164483: cf79763e5d2689fc1cd59f16a8b95218cc67accd 164479: 59b3f1626352ff811d66bb3385b2a886c0762ddc v: v3 --- [refs] | 2 +- trunk/mm/shmem.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 968f60d21f89..f4dfd61e966e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e17b17f1fc7b2f24383a693d63550d9e1460081 +refs/heads/master: 425fbf047cc70bb30dff368a6da02c8c2d229318 diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c index b4b56fd1e772..b206a7a32e2a 100644 --- a/trunk/mm/shmem.c +++ b/trunk/mm/shmem.c @@ -2309,17 +2309,14 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent) int err = -ENOMEM; /* Round up to L1_CACHE_BYTES to resist false sharing */ - sbinfo = kmalloc(max((int)sizeof(struct shmem_sb_info), + sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL); if (!sbinfo) return -ENOMEM; - sbinfo->max_blocks = 0; - sbinfo->max_inodes = 0; sbinfo->mode = S_IRWXUGO | S_ISVTX; sbinfo->uid = current_fsuid(); sbinfo->gid = current_fsgid(); - sbinfo->mpol = NULL; sb->s_fs_info = sbinfo; #ifdef CONFIG_TMPFS