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 c6a4ab6bf793..1d50e9e5a966 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1069,7 +1069,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 c5089383ca72..6a8f37d8e38d 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 5145095943d8..99844196fe33 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;
--
2.1.4
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
