lkml.org 
[lkml]   [2006]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 17/30] NFS: Start rpciod in server common management [try #11]
Date
Start rpciod in the server common (nfs_client struct) management code rather
than in the superblock management code. This means we only need to "start" it
once per server instead of once per superblock.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

fs/nfs/super.c | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f3f229d..321f0d7 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -717,18 +717,15 @@ static int nfs_clone_generic_sb(struct n
if (server->hostname == NULL)
goto free_server;
memcpy(server->hostname, hostname, len);
- error = rpciod_up();
- if (error != 0)
- goto free_hostname;

sb = fill_sb(server, data);
if (IS_ERR(sb)) {
error = PTR_ERR(sb);
- goto kill_rpciod;
+ goto free_hostname;
}

if (sb->s_root)
- goto out_rpciod_down;
+ goto out_share;

server = fill_server(sb, data);
if (IS_ERR(server)) {
@@ -740,14 +737,11 @@ out_deactivate:
up_write(&sb->s_umount);
deactivate_super(sb);
return error;
-out_rpciod_down:
- rpciod_down();
+out_share:
kfree(server->hostname);
nfs_put_client(server->nfs_client);
kfree(server);
return simple_set_mnt(mnt, sb);
-kill_rpciod:
- rpciod_down();
free_hostname:
kfree(server->hostname);
free_server:
@@ -934,22 +928,14 @@ #endif /* CONFIG_NFS_V3 */
goto out_err;
}

- /* Fire up rpciod if not yet running */
- error = rpciod_up();
- if (error < 0) {
- dprintk("%s: couldn't start rpciod! Error = %d\n",
- __FUNCTION__, error);
- goto out_err;
- }
-
s = sget(fs_type, nfs_compare_super, nfs_set_super, server);
if (IS_ERR(s)) {
error = PTR_ERR(s);
- goto out_err_rpciod;
+ goto out_err;
}

if (s->s_root)
- goto out_rpciod_down;
+ goto out_share;

s->s_flags = flags;

@@ -962,13 +948,10 @@ #endif /* CONFIG_NFS_V3 */
s->s_flags |= MS_ACTIVE;
return simple_set_mnt(mnt, s);

-out_rpciod_down:
- rpciod_down();
+out_share:
kfree(server);
return simple_set_mnt(mnt, s);

-out_err_rpciod:
- rpciod_down();
out_err:
kfree(server);
out_err_noserver:
@@ -989,8 +972,6 @@ static void nfs_kill_super(struct super_
if (!(server->flags & NFS_MOUNT_NONLM))
lockd_down(); /* release rpc.lockd */

- rpciod_down(); /* release rpciod */
-
nfs_free_iostats(server->io_stats);
kfree(server->hostname);
nfs_put_client(server->nfs_client);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-07-27 23:01    [W:0.121 / U:0.712 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site