From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763504AbZE0RqF (ORCPT ); Wed, 27 May 2009 13:46:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761708AbZE0RoN (ORCPT ); Wed, 27 May 2009 13:44:13 -0400 Received: from jalapeno.cc.columbia.edu ([128.59.29.5]:54084 "EHLO jalapeno.cc.columbia.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761407AbZE0RoM (ORCPT ); Wed, 27 May 2009 13:44:12 -0400 From: Oren Laadan To: Andrew Morton Cc: Linus Torvalds , containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-api@vger.kernel.org, Serge Hallyn , Dave Hansen , Ingo Molnar , "H. Peter Anvin" , Alexander Viro , Pavel Emelyanov , Alexey Dobriyan , Oren Laadan Subject: [RFC v16][PATCH 35/43] c/r (ipc): export interface from ipc/shm.c to delete ipc shm Date: Wed, 27 May 2009 13:33:01 -0400 Message-Id: <1243445589-32388-36-git-send-email-orenl@cs.columbia.edu> X-Mailer: git-send-email 1.6.0.1 In-Reply-To: <1243445589-32388-1-git-send-email-orenl@cs.columbia.edu> References: <1243445589-32388-1-git-send-email-orenl@cs.columbia.edu> X-No-Spam-Score: Local Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Export shmctl_down() which will be used in the next patch during restart to delete an ipc shm (the shm is mapped already, so it won't be lost). Signed-off-by: Oren Laadan --- include/linux/shm.h | 4 ++++ ipc/shm.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/linux/shm.h b/include/linux/shm.h index eca6235..ec36e99 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -118,6 +118,10 @@ static inline int is_file_shm_hugepages(struct file *file) } #endif +struct ipc_namespace; +extern int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, + struct shmid_ds __user *buf, int version); + #endif /* __KERNEL__ */ #endif /* _LINUX_SHM_H_ */ diff --git a/ipc/shm.c b/ipc/shm.c index 7dd5f0c..8aba22f 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -598,8 +598,8 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss, * to be held in write mode. * NOTE: no locks must be held, the rw_mutex is taken inside this function. */ -static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, - struct shmid_ds __user *buf, int version) +int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, + struct shmid_ds __user *buf, int version) { struct kern_ipc_perm *ipcp; struct shmid64_ds shmid64; -- 1.6.0.4