lkml.org 
[lkml]   [2011]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 4/5] NFS: remove RPC PipeFS mount point reference from blocklayout routines
    From
    Date
    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>

    ---
    fs/nfs/blocklayout/blocklayout.c | 9 +--------
    1 files changed, 1 insertions(+), 8 deletions(-)
    diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
    index acf7ac9..8211ffd 100644
    --- a/fs/nfs/blocklayout/blocklayout.c
    +++ b/fs/nfs/blocklayout/blocklayout.c
    @@ -1032,7 +1032,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 0;
    dentry = nfs4blocklayout_register_sb(pipefs_sb, pipe);
    rpc_put_sb_net(net);
    return dentry;
    @@ -1083,7 +1083,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__);
    @@ -1093,12 +1092,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;


    \
     
     \ /
      Last update: 2011-11-29 10:15    [from the cache]
    ©2003-2011 Jasper Spaans