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 8b0c87530b04e810fa36783564713fa149f9a822..5879e906fb6156fb4f32c8ea80eb0408f622b30f 100644 (file)
--- 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);
                }