Skip to content

Commit

Permalink
NFS: remove RPC PipeFS mount point reference from blocklayout routines
Browse files Browse the repository at this point in the history
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: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Stanislav Kinsbursky authored and Trond Myklebust committed Jan 31, 2012
1 parent 627f306 commit 2561d61
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions fs/nfs/blocklayout/blocklayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ static struct dentry *nfs4blocklayout_register_net(struct net *net,

pipefs_sb = rpc_get_sb_net(net);
if (!pipefs_sb)
return ERR_PTR(-ENOENT);
return NULL;
dentry = nfs4blocklayout_register_sb(pipefs_sb, pipe);
rpc_put_sb_net(net);
return dentry;
Expand Down Expand Up @@ -1145,7 +1145,6 @@ static struct pernet_operations nfs4blocklayout_net_ops = {

static int __init nfs4blocklayout_init(void)
{
struct vfsmount *mnt;
int ret;

dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
Expand All @@ -1155,12 +1154,6 @@ static int __init nfs4blocklayout_init(void)
goto out;

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);
if (ret)
goto out_remove;
Expand Down

0 comments on commit 2561d61

Please sign in to comment.