1 files changed, 5 insertions, 19 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 790240cd067f..e77ec698cf40 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -112,23 +112,8 @@ void __init shm_init (void)
 }
 
 /*
- * shm_lock_(check_)down routines are called in the paths where the rw_mutex
- * is held to protect access to the idr tree.
- */
-static inline struct shmid_kernel *shm_lock_down(struct ipc_namespace *ns,
-                                                int id)
-{
-        struct kern_ipc_perm *ipcp = ipc_lock_down(&shm_ids(ns), id);
-
-        if (IS_ERR(ipcp))
-                return (struct shmid_kernel *)ipcp;
-
-        return container_of(ipcp, struct shmid_kernel, shm_perm);
-}
-
-/*
  * shm_lock_(check_) routines are called in the paths where the rw_mutex
- * is not held.
+ * is not necessarily held.
  */
 static inline struct shmid_kernel *shm_lock(struct ipc_namespace *ns, int id)
 {
@@ -211,7 +196,7 @@ static void shm_close(struct vm_area_struct *vma)
 
         down_write(&shm_ids(ns).rw_mutex);
         /* remove from the list of attaches of the shm segment */
-        shp = shm_lock_down(ns, sfd->id);
+        shp = shm_lock(ns, sfd->id);
         BUG_ON(IS_ERR(shp));
         shp->shm_lprid = task_tgid_vnr(current);
         shp->shm_dtim = get_seconds();
@@ -577,7 +562,8 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
 
                 if (is_file_hugepages(shp->shm_file)) {
                         struct address_space *mapping = inode->i_mapping;
-                        *rss += (HPAGE_SIZE/PAGE_SIZE)*mapping->nrpages;
+                        struct hstate *h = hstate_file(shp->shm_file);
+                        *rss += pages_per_huge_page(h) * mapping->nrpages;
                 } else {
                         struct shmem_inode_info *info = SHMEM_I(inode);
                         spin_lock(&info->lock);
@@ -931,7 +917,7 @@ invalid:
 
 out_nattch:
         down_write(&shm_ids(ns).rw_mutex);
-        shp = shm_lock_down(ns, shmid);
+        shp = shm_lock(ns, shmid);
         BUG_ON(IS_ERR(shp));
         shp->shm_nattch--;
         if(shp->shm_nattch == 0 &&