From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Mar 2012 16:04:48 +0000 (-0700)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Tag: MMI-PSA29.97-13-9~17240
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95211279c5ad00a317c98221d7e4365e02f20836;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'akpm' (Andrew's patch-bomb)

Merge first batch of patches from Andrew Morton:
 "A few misc things and all the MM queue"

* emailed from Andrew Morton <akpm@linux-foundation.org>: (92 commits)
  memcg: avoid THP split in task migration
  thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE
  memcg: clean up existing move charge code
  mm/memcontrol.c: remove unnecessary 'break' in mem_cgroup_read()
  mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()
  mm/memcontrol.c: s/stealed/stolen/
  memcg: fix performance of mem_cgroup_begin_update_page_stat()
  memcg: remove PCG_FILE_MAPPED
  memcg: use new logic for page stat accounting
  memcg: remove PCG_MOVE_LOCK flag from page_cgroup
  memcg: simplify move_account() check
  memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)
  memcg: kill dead prev_priority stubs
  memcg: remove PCG_CACHE page_cgroup flag
  memcg: let css_get_next() rely upon rcu_read_lock()
  cgroup: revert ss_id_lock to spinlock
  idr: make idr_get_next() good for rcu_read_lock()
  memcg: remove unnecessary thp check in page stat accounting
  memcg: remove redundant returns
  memcg: enum lru_list lru
  ...
---

95211279c5ad00a317c98221d7e4365e02f20836
diff --cc fs/hugetlbfs/inode.c
index 81932fa1861a,269163324b73..ea251749d9d5
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@@ -863,11 -898,20 +896,13 @@@ hugetlbfs_fill_super(struct super_bloc
  	sb->s_magic = HUGETLBFS_MAGIC;
  	sb->s_op = &hugetlbfs_ops;
  	sb->s_time_gran = 1;
 -	inode = hugetlbfs_get_root(sb, &config);
 -	if (!inode)
 +	sb->s_root = d_make_root(hugetlbfs_get_root(sb, &config));
 +	if (!sb->s_root)
  		goto out_free;
 -
 -	root = d_alloc_root(inode);
 -	if (!root) {
 -		iput(inode);
 -		goto out_free;
 -	}
 -	sb->s_root = root;
  	return 0;
  out_free:
+ 	if (sbinfo->spool)
+ 		kfree(sbinfo->spool);
  	kfree(sbinfo);
  	return -ENOMEM;
  }