Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NFS: Fix nfs_alloc_client()

Browse source 
The scheme to indicate which services have been started up appears to be
seriously broken.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2006-08-22 20:06:14 -04:00
parent 36b15c54cd
commit 9c5bf38d85
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/nfs/client.c
View file

@ -113,9 +113,9 @@ static struct nfs_client *nfs_alloc_client(const char *hostname,
if (error < 0) { if (error < 0) {
dprintk("%s: couldn't start rpciod! Error = %d\n", dprintk("%s: couldn't start rpciod! Error = %d\n",
__FUNCTION__, error); __FUNCTION__, error);
__set_bit(NFS_CS_RPCIOD, &clp->cl_res_state);
goto error_1; goto error_1;
} }
__set_bit(NFS_CS_RPCIOD, &clp->cl_res_state);
if (nfsversion == 4) { if (nfsversion == 4) {
if (nfs_callback_up() < 0) if (nfs_callback_up() < 0)
@ -153,8 +153,8 @@ static struct nfs_client *nfs_alloc_client(const char *hostname,
return clp; return clp;
error_3: error_3:
nfs_callback_down(); if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state))
__clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state); nfs_callback_down();
error_2: error_2:
rpciod_down(); rpciod_down();
__clear_bit(NFS_CS_RPCIOD, &clp->cl_res_state); __clear_bit(NFS_CS_RPCIOD, &clp->cl_res_state);
@ -195,7 +195,7 @@ static void nfs_free_client(struct nfs_client *clp)
nfs_callback_down(); nfs_callback_down();
if (__test_and_clear_bit(NFS_CS_RPCIOD, &clp->cl_res_state)) if (__test_and_clear_bit(NFS_CS_RPCIOD, &clp->cl_res_state))
rpciod_down(); rpciod_down();
kfree(clp->cl_hostname); kfree(clp->cl_hostname);
kfree(clp); kfree(clp);
@ -881,9 +881,9 @@ static int nfs4_init_client(struct nfs_client *clp,
if (error < 0) { if (error < 0) {
dprintk("%s: failed to create idmapper. Error = %d\n", dprintk("%s: failed to create idmapper. Error = %d\n",
__FUNCTION__, error); __FUNCTION__, error);
__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
goto error; goto error;
} }
__set_bit(NFS_CS_IDMAP, &clp->cl_res_state);
nfs_mark_client_ready(clp, NFS_CS_READY); nfs_mark_client_ready(clp, NFS_CS_READY);
return 0; return 0;