---

yaml --- r: 222181 b: refs/heads/master c: 04e4bd1 h: refs/heads/master i: 222179: fa98427 v: v3
git-mirror · Nov 16, 2010 · b1114df · b1114df
1 parent dd61b78
commit b1114df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94f58df8e545657f0b2d16eca1ac7a4ec39ed6be
+refs/heads/master: 04e4bd1c67f941d81bff78a3b6b94194f081b7df
diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c
@@ -34,6 +34,7 @@
 #include <linux/mount.h>
 #include <linux/sched.h>
 #include <linux/vmalloc.h>
+#include <linux/kmemleak.h>
 
 #include "delegation.h"
 #include "iostat.h"
@@ -238,6 +239,11 @@ int nfs_readdir_make_qstr(struct qstr *string, const char *name, unsigned int le
 	string->name = kmemdup(name, len, GFP_KERNEL);
 	if (string->name == NULL)
 		return -ENOMEM;
+	/*
+	 * Avoid a kmemleak false positive. The pointer to the name is stored
+	 * in a page cache page which kmemleak does not scan.
+	 */
+	kmemleak_not_leak(string->name);
 	string->hash = full_name_hash(name, len);
 	return 0;
 }