Commit 2561d618 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust

NFS: remove RPC PipeFS mount point reference from blocklayout routines

This is a cleanup patch. We don't need this reference anymore, because
blocklayout pipes dentries now creates and destroys in per-net operations and
on PipeFS mount/umount notification.
Note that nfs4blocklayout_register_net() now returns 0 instead of -ENOENT in
case of PipeFS superblock absence. This is ok, because blocklayout pipe dentry
will be created on PipeFS mount event.
Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 627f3066
...@@ -1094,7 +1094,7 @@ static struct dentry *nfs4blocklayout_register_net(struct net *net, ...@@ -1094,7 +1094,7 @@ static struct dentry *nfs4blocklayout_register_net(struct net *net,
pipefs_sb = rpc_get_sb_net(net); pipefs_sb = rpc_get_sb_net(net);
if (!pipefs_sb) if (!pipefs_sb)
return ERR_PTR(-ENOENT); return NULL;
dentry = nfs4blocklayout_register_sb(pipefs_sb, pipe); dentry = nfs4blocklayout_register_sb(pipefs_sb, pipe);
rpc_put_sb_net(net); rpc_put_sb_net(net);
return dentry; return dentry;
...@@ -1145,7 +1145,6 @@ static struct pernet_operations nfs4blocklayout_net_ops = { ...@@ -1145,7 +1145,6 @@ static struct pernet_operations nfs4blocklayout_net_ops = {
static int __init nfs4blocklayout_init(void) static int __init nfs4blocklayout_init(void)
{ {
struct vfsmount *mnt;
int ret; int ret;
dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__); dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
...@@ -1155,12 +1154,6 @@ static int __init nfs4blocklayout_init(void) ...@@ -1155,12 +1154,6 @@ static int __init nfs4blocklayout_init(void)
goto out; goto out;
init_waitqueue_head(&bl_wq); init_waitqueue_head(&bl_wq);
mnt = rpc_get_mount();
if (IS_ERR(mnt)) {
ret = PTR_ERR(mnt);
goto out_remove;
}
ret = rpc_pipefs_notifier_register(&nfs4blocklayout_block); ret = rpc_pipefs_notifier_register(&nfs4blocklayout_block);
if (ret) if (ret)
goto out_remove; goto out_remove;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment