From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753856AbbCQCpa (ORCPT ); Mon, 16 Mar 2015 22:45:30 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:60405 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753656AbbCQCpZ (ORCPT ); Mon, 16 Mar 2015 22:45:25 -0400 X-Sasl-enc: Isr069v+vah8Oy0ItALH2E1Efxnqupe4MqKoHuQMAg8y 1426560324 Subject: [RFC PATCH v4 03/12] vfs - move mnt_namespace definition to linux/mount.h From: Ian Kent To: Kernel Mailing List Cc: David Howells , Oleg Nesterov , Trond Myklebust , "J. Bruce Fields" , Benjamin Coddington , Al Viro , Jeff Layton , "Eric W. Biederman" Date: Tue, 17 Mar 2015 10:45:09 +0800 Message-ID: <20150317024509.24592.88118.stgit@pluto.fritz.box> In-Reply-To: <20150317022308.24592.35785.stgit@pluto.fritz.box> References: <20150317022308.24592.35785.stgit@pluto.fritz.box> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Kent The mnt_namespace definition will be needed by the usermode helper contained execution implementation, move it to include/linux/mount.h. Signed-off-by: Ian Kent Cc: Benjamin Coddington Cc: Al Viro Cc: J. Bruce Fields Cc: David Howells Cc: Trond Myklebust Cc: Oleg Nesterov Cc: Eric W. Biederman Cc: Jeff Layton --- fs/mount.h | 12 ------------ include/linux/mount.h | 14 +++++++++++++- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/mount.h b/fs/mount.h index 6a61c2b..5b8423b 100644 --- a/fs/mount.h +++ b/fs/mount.h @@ -1,20 +1,8 @@ #include #include #include -#include #include -struct mnt_namespace { - atomic_t count; - struct ns_common ns; - struct mount * root; - struct list_head list; - struct user_namespace *user_ns; - u64 seq; /* Sequence number to prevent loops */ - wait_queue_head_t poll; - u64 event; -}; - struct mnt_pcp { int mnt_count; int mnt_writers; diff --git a/include/linux/mount.h b/include/linux/mount.h index c2c561d..39dbcdf 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -15,11 +15,12 @@ #include #include #include +#include +#include struct super_block; struct vfsmount; struct dentry; -struct mnt_namespace; #define MNT_NOSUID 0x01 #define MNT_NODEV 0x02 @@ -62,6 +63,17 @@ struct mnt_namespace; #define MNT_SYNC_UMOUNT 0x2000000 #define MNT_MARKED 0x4000000 +struct mnt_namespace { + atomic_t count; + struct ns_common ns; + struct mount * root; + struct list_head list; + struct user_namespace *user_ns; + u64 seq; /* Sequence number to prevent loops */ + wait_queue_head_t poll; + u64 event; +}; + struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */