From 39765460f3dd69cce1619f1b0407503b85923b54 Mon Sep 17 00:00:00 2001
From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Date: Tue, 10 Jan 2012 02:43:59 +0300
Subject: [PATCH] --- yaml --- r: 283219 b: refs/heads/master c:
 ace8577aeb438025ecf642f5eda3aa551d251951 h: refs/heads/master i:   283217:
 32ccc9bc2853245be8c85b7335e7095e923544e1   283215:
 392abcec42d4d8167c7d28d09d563e7f01a78b19 v: v3

---
 [refs]               |  2 +-
 trunk/fs/block_dev.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f62e884ba2fe..bbb1f087d697 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaf5f9073533cde21c7121c136f1c3f072d9cf59
+refs/heads/master: ace8577aeb438025ecf642f5eda3aa551d251951
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 69a5b6fbee2b..afe74dda632b 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -25,7 +25,6 @@
 #include <linux/uio.h>
 #include <linux/namei.h>
 #include <linux/log2.h>
-#include <linux/kmemleak.h>
 #include <linux/cleancache.h>
 #include <asm/uaccess.h>
 #include "internal.h"
@@ -521,7 +520,7 @@ static struct super_block *blockdev_superblock __read_mostly;
 void __init bdev_cache_init(void)
 {
 	int err;
-	struct vfsmount *bd_mnt;
+	static struct vfsmount *bd_mnt;
 
 	bdev_cachep = kmem_cache_create("bdev_cache", sizeof(struct bdev_inode),
 			0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
@@ -533,12 +532,7 @@ void __init bdev_cache_init(void)
 	bd_mnt = kern_mount(&bd_type);
 	if (IS_ERR(bd_mnt))
 		panic("Cannot create bdev pseudo-fs");
-	/*
-	 * This vfsmount structure is only used to obtain the
-	 * blockdev_superblock, so tell kmemleak not to report it.
-	 */
-	kmemleak_not_leak(bd_mnt);
-	blockdev_superblock = bd_mnt->mnt_sb;	/* For writeback */
+	blockdev_superblock = bd_mnt->mnt_sb;   /* For writeback */
 }
 
 /*