From 427e3a559058d1787e98c05fb514279e545628b3 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 10 Oct 2012 15:25:26 -0400 Subject: [PATCH] --- yaml --- r: 333902 b: refs/heads/master c: a608ca21f58ee44df5a71ba140e98498f3ebc2cd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 3 +-- trunk/init/do_mounts.c | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 84159bb1123b..ee7d7832b29c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fa6b5ecbf092c6ee752ece8a55d71f663d23254 +refs/heads/master: a608ca21f58ee44df5a71ba140e98498f3ebc2cd diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 8ef2fc9f1f08..b44b4ca82164 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -2228,8 +2228,7 @@ extern void __init vfs_caches_init(unsigned long); extern struct kmem_cache *names_cachep; -#define __getname_gfp(gfp) kmem_cache_alloc(names_cachep, (gfp)) -#define __getname() __getname_gfp(GFP_KERNEL) +#define __getname() kmem_cache_alloc(names_cachep, GFP_KERNEL) #define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) #ifndef CONFIG_AUDITSYSCALL #define putname(name) __putname(name) diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c index d3f0aeed2d39..f8a66424360d 100644 --- a/trunk/init/do_mounts.c +++ b/trunk/init/do_mounts.c @@ -353,8 +353,9 @@ static int __init do_mount_root(char *name, char *fs, int flags, void *data) void __init mount_block_root(char *name, int flags) { - char *fs_names = __getname_gfp(GFP_KERNEL - | __GFP_NOTRACK_FALSE_POSITIVE); + struct page *page = alloc_page(GFP_KERNEL | + __GFP_NOTRACK_FALSE_POSITIVE); + char *fs_names = page_address(page); char *p; #ifdef CONFIG_BLOCK char b[BDEVNAME_SIZE]; @@ -406,7 +407,7 @@ void __init mount_block_root(char *name, int flags) #endif panic("VFS: Unable to mount root fs on %s", b); out: - putname(fs_names); + put_page(page); } #ifdef CONFIG_ROOT_NFS