From: chris.mason@oracle.com <chris.mason@oracle.com>
Date: Sat, 17 Jul 2010 02:49:36 +0000 (-0400)
Subject: don't warn on for mlock ulimits on shm_hugetlb
X-Git-Tag: v2.6.39-400.9.0~391^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c223faa72c92eba67c65c9a293dac11b43dc2810;p=users%2Fjedix%2Flinux-maple.git

don't warn on for mlock ulimits on shm_hugetlb

Orabug: 14096387

cherry-picked from git://ca-git.us.oracle.com/linux-2.6-unbreakable.git
commit ec208c6e401a2b6100ac8fa00eeb03bd79434c07

We get this once per DB startup, lets turn it off for now.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

Conflicts:

	fs/hugetlbfs/inode.c

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 8b0c87530b04..5879e906fb61 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -931,9 +931,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size,
 
 	if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) {
 		*user = current_user();
-		if (user_shm_lock(size, *user)) {
-			printk_once(KERN_WARNING "Using mlock ulimits for SHM_HUGETLB is deprecated\n");
-		} else {
+		if (user_shm_lock(size, *user) == 0) {
 			*user = NULL;
 			return ERR_PTR(-EPERM);
 		}