Merge ../scsi-rc-fixes-2.6

5 files changed, 17 insertions, 2 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index 5b213d952545..1266b1d0c8e3 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -52,7 +52,7 @@ struct msg_receiver {
         long                    r_msgtype;
         long                    r_maxsize;
 
-        volatile struct msg_msg *r_msg;
+        struct msg_msg          *volatile r_msg;
 };
 
 /* one msg_sender for each sleeping sender */
@@ -124,6 +124,7 @@ void msg_exit_ns(struct ipc_namespace *ns)
         }
         mutex_unlock(&msg_ids(ns).mutex);
 
+        ipc_fini_ids(ns->ids[IPC_MSG_IDS]);
         kfree(ns->ids[IPC_MSG_IDS]);
         ns->ids[IPC_MSG_IDS] = NULL;
 }
diff --git a/ipc/sem.c b/ipc/sem.c
index 0dafcc455f92..21b3289d640c 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -161,6 +161,7 @@ void sem_exit_ns(struct ipc_namespace *ns)
         }
         mutex_unlock(&sem_ids(ns).mutex);
 
+        ipc_fini_ids(ns->ids[IPC_SEM_IDS]);
         kfree(ns->ids[IPC_SEM_IDS]);
         ns->ids[IPC_SEM_IDS] = NULL;
 }
diff --git a/ipc/shm.c b/ipc/shm.c
index bfbd317ec11c..d1198dd07a1a 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -116,6 +116,7 @@ void shm_exit_ns(struct ipc_namespace *ns)
         }
         mutex_unlock(&shm_ids(ns).mutex);
 
+        ipc_fini_ids(ns->ids[IPC_SHM_IDS]);
         kfree(ns->ids[IPC_SHM_IDS]);
         ns->ids[IPC_SHM_IDS] = NULL;
 }
diff --git a/ipc/util.c b/ipc/util.c
index 42479e4eec59..cd8bb14a431f 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -301,7 +301,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize)
          */
         rcu_assign_pointer(ids->entries, new);
 
-        ipc_rcu_putref(old);
+        __ipc_fini_ids(ids, old);
         return newsize;
 }
 
diff --git a/ipc/util.h b/ipc/util.h
index c8fd6b9d77b5..e3aa2c5c97dc 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -83,6 +83,18 @@ void* ipc_rcu_alloc(int size);
 void ipc_rcu_getref(void *ptr);
 void ipc_rcu_putref(void *ptr);
 
+static inline void __ipc_fini_ids(struct ipc_ids *ids,
+                struct ipc_id_ary *entries)
+{
+        if (entries != &ids->nullentry)
+                ipc_rcu_putref(entries);
+}
+
+static inline void ipc_fini_ids(struct ipc_ids *ids)
+{
+        __ipc_fini_ids(ids, ids->entries);
+}
+
 struct kern_ipc_perm* ipc_get(struct ipc_ids* ids, int id);
 struct kern_ipc_perm* ipc_lock(struct ipc_ids* ids, int id);
 void ipc_lock_by_ptr(struct kern_ipc_perm *ipcp);