luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Initialise the nfs_net->nfs_client_lock

Browse Source 
Ensure that we initialise the nfs_net->nfs_client_lock spinlock.
Also ensure that nfs_server_remove_lists() doesn't try to
dereference server->nfs_client before that is initialised.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
This commit is contained in:
Trond Myklebust 2012-02-07 00:05:11 -05:00
parent 3b64739fb9
commit 4c03ae4a89
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/client.c
View File

@ -1055,11 +1055,14 @@ static void nfs_server_insert_lists(struct nfs_server *server)
static void nfs_server_remove_lists(struct nfs_server *server) static void nfs_server_remove_lists(struct nfs_server *server)
{ {
struct nfs_client *clp = server->nfs_client; struct nfs_client *clp = server->nfs_client;
struct nfs_net *nn = net_generic(clp->net, nfs_net_id); struct nfs_net *nn;
if (clp == NULL)
return;
nn = net_generic(clp->net, nfs_net_id);
spin_lock(&nn->nfs_client_lock); spin_lock(&nn->nfs_client_lock);
list_del_rcu(&server->client_link); list_del_rcu(&server->client_link);
if (clp && list_empty(&clp->cl_superblocks)) if (list_empty(&clp->cl_superblocks))
set_bit(NFS_CS_STOP_RENEW, &clp->cl_res_state); set_bit(NFS_CS_STOP_RENEW, &clp->cl_res_state);
list_del(&server->master_link); list_del(&server->master_link);
spin_unlock(&nn->nfs_client_lock); spin_unlock(&nn->nfs_client_lock);
@ -1777,6 +1780,7 @@ void nfs_clients_init(struct net *net)
#ifdef CONFIG_NFS_V4 #ifdef CONFIG_NFS_V4
idr_init(&nn->cb_ident_idr); idr_init(&nn->cb_ident_idr);
#endif #endif
spin_lock_init(&nn->nfs_client_lock);
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS