vserver 1.9.5.x5

[linux-2.6.git] / net / sunrpc / pmap_clnt.c

diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index 61bdc97..2a5d319 100644 (file)
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -31,8 +31,8 @@
 static struct rpc_procinfo     pmap_procedures[];
 static struct rpc_clnt *       pmap_create(char *, struct sockaddr_in *, int);
 static void                    pmap_getport_done(struct rpc_task *);
-extern struct rpc_program      pmap_program;
-static spinlock_t              pmap_lock = SPIN_LOCK_UNLOCKED;
+static struct rpc_program      pmap_program;
+static DEFINE_SPINLOCK(pmap_lock);
 
 /*
  * Obtain the port for a given RPC service on a given host. This one can
@@ -292,7 +292,7 @@ static struct rpc_version * pmap_version[] = {
 
 static struct rpc_stat         pmap_stats;
 
-struct rpc_program     pmap_program = {
+static struct rpc_program      pmap_program = {
        .name           = "portmap",
        .number         = RPC_PMAP_PROGRAM,
        .nrvers         = ARRAY_SIZE(pmap_version),