The commit is pushed to "branch-rh7-3.10.0-229.7.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-229.7.2.vz7.6.3 ------> commit d0856fdc15e0b49540c454b42a11ddf2af70cda6 Author: Vladimir Davydov <vdavy...@parallels.com> Date: Fri Aug 28 16:42:43 2015 +0400
Revert "nfsd/sunrpc/mqueue: use sb->s_ns instead of data in fill_super" Patchset description: zap sb->s_ns + fix memleak in binfmt_misc Vladimir Davydov (6): binfmt_misc: do not use sb->s_fs_info Revert "VE/VFS: use sb->s_ns member to store namespace for mount_ns() calls" Revert "ve/sunrpc: use correct pointer to net_namespace in auth_gss.c" Revert "nfsd/sunrpc/mqueue: use sb->s_ns instead of data in fill_super" binfmt_misc: do not use s_ns binfmt_misc: destroy all nodes on ve stop https://jira.sw.ru/browse/PSBM-39154 Reviewed-by: Cyrill Gorcunov <gorcu...@virtuozzo.com> ====================== This patch description: This reverts commit 610d54ccee1af63b1b361d18ec4ee9fa5230dea8. Since commit 9e7411c5c3b5 was reverted, this one is no longer needed either. Signed-off-by: Vladimir Davydov <vdavy...@parallels.com> --- fs/nfsd/nfsctl.c | 2 +- ipc/mqueue.c | 2 +- net/sunrpc/rpc_pipe.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 7411a56..048d61d 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1113,7 +1113,7 @@ static int nfsd_fill_super(struct super_block * sb, void * data, int silent) #endif /* last one */ {""} }; - struct net *net = sb->s_ns; + struct net *net = data; int ret; ret = simple_fill_super(sb, 0x6e667364, nfsd_files); diff --git a/ipc/mqueue.c b/ipc/mqueue.c index c508938..6a8f37d 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -309,7 +309,7 @@ err: static int mqueue_fill_super(struct super_block *sb, void *data, int silent) { struct inode *inode; - struct ipc_namespace *ns = sb->s_ns; + struct ipc_namespace *ns = data; sb->s_blocksize = PAGE_CACHE_SIZE; sb->s_blocksize_bits = PAGE_CACHE_SHIFT; diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index b8f6185..79681e5 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c @@ -1395,7 +1395,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) { struct inode *inode; struct dentry *root, *gssd_dentry; - struct net *net = sb->s_ns; + struct net *net = data; struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); int err; _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel