From 0a7a692cbbbd09200acd1367fa1cee4deae37bb2 Mon Sep 17 00:00:00 2001
From: Tony Battersby <tonyb@cybernetics.com>
Date: Thu, 2 Apr 2009 16:58:26 -0700
Subject: [PATCH] --- yaml --- r: 139701 b: refs/heads/master c:
 e562aebc6ccd4385cbbf24debe88ab4bb500c5b4 h: refs/heads/master i:   139699:
 f8556389173d3328b1f6362b98ae8ff0b84da00f v: v3

---
 [refs]          | 2 +-
 trunk/ipc/shm.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5b9d3ef8d8e0..df46e447dcd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40e8a10de2c9f87e892dcd5a6f9d1b208329ffea
+refs/heads/master: e562aebc6ccd4385cbbf24debe88ab4bb500c5b4
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index f239d87e0d37..faa46da99ebe 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -555,12 +555,14 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
 	in_use = shm_ids(ns).in_use;
 
 	for (total = 0, next_id = 0; total < in_use; next_id++) {
+		struct kern_ipc_perm *ipc;
 		struct shmid_kernel *shp;
 		struct inode *inode;
 
-		shp = idr_find(&shm_ids(ns).ipcs_idr, next_id);
-		if (shp == NULL)
+		ipc = idr_find(&shm_ids(ns).ipcs_idr, next_id);
+		if (ipc == NULL)
 			continue;
+		shp = container_of(ipc, struct shmid_kernel, shm_perm);
 
 		inode = shp->shm_file->f_path.dentry->d_inode;