aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFrom: Mel Gorman <mel@csn.ul.ie>2009-09-23 18:56:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 10:20:56 -0400
commitef1ff6b8c08954bc203b59e887d1e580dd91755a (patch)
tree6bffcfc02cb57087362defe4cf045c6f70f62a6d /fs
parent2c6854fdadf940678fd54779b778f6faafb870bb (diff)
hugetlbfs: do not call user_shm_lock() for MAP_HUGETLB fix
Commit 6bfde05bf5c ("hugetlbfs: allow the creation of files suitable for MAP_PRIVATE on the vfs internal mount") altered can_do_hugetlb_shm() to check if a file is being created for shared memory or mmap(). If this returns false, we then unconditionally call user_shm_lock() triggering a warning. This block should never be entered for MAP_HUGETLB. This patch partially reverts the problem and fixes the check. Signed-off-by: Eric B Munson <ebmunson@us.ibm.com> Cc: David Rientjes <rientjes@google.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Adam Litke <agl@us.ibm.com> Cc: David Gibson <david@gibson.dropbear.id.au> Cc: Lee Schermerhorn <lee.schermerhorn@hp.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/hugetlbfs/inode.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index eba6d552d9c9..133335479c24 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -936,15 +936,9 @@ static struct file_system_type hugetlbfs_fs_type = {
936 936
937static struct vfsmount *hugetlbfs_vfsmount; 937static struct vfsmount *hugetlbfs_vfsmount;
938 938
939static int can_do_hugetlb_shm(int creat_flags) 939static int can_do_hugetlb_shm(void)
940{ 940{
941 if (creat_flags != HUGETLB_SHMFS_INODE) 941 return capable(CAP_IPC_LOCK) || in_group_p(sysctl_hugetlb_shm_group);
942 return 0;
943 if (capable(CAP_IPC_LOCK))
944 return 1;
945 if (in_group_p(sysctl_hugetlb_shm_group))
946 return 1;
947 return 0;
948} 942}
949 943
950struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag, 944struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,
@@ -960,7 +954,7 @@ struct file *hugetlb_file_setup(const char *name, size_t size, int acctflag,
960 if (!hugetlbfs_vfsmount) 954 if (!hugetlbfs_vfsmount)
961 return ERR_PTR(-ENOENT); 955 return ERR_PTR(-ENOENT);
962 956
963 if (!can_do_hugetlb_shm(creat_flags)) { 957 if (creat_flags == HUGETLB_SHMFS_INODE && !can_do_hugetlb_shm()) {
964 *user = current_user(); 958 *user = current_user();
965 if (user_shm_lock(size, *user)) { 959 if (user_shm_lock(size, *user)) {
966 WARN_ONCE(1, 960 WARN_ONCE(1,