---

yaml --- r: 164487 b: refs/heads/master c: 425fbf0 h: refs/heads/master i: 164485: 651629e 164483: cf79763 164479: 59b3f16 v: v3
git-mirror · Sep 22, 2009 · e477bdb · e477bdb
1 parent 370c763
commit e477bdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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