Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50467914 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NLM: sem to mutex conversion 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3134cbec

fs/lockd/host.c

+4 −4
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ nlm_lookup_host(int server, struct sockaddr_in *sin, 
	host->h_version    = version;

	host->h_proto      = proto;

	host->h_rpcclnt    = NULL;

	init_MUTEX(&host->h_sema);

	mutex_init(&host->h_mutex);

	host->h_nextrebind = jiffies + NLM_HOST_REBIND;

	host->h_expires    = jiffies + NLM_HOST_EXPIRE;

	atomic_set(&host->h_count, 1);
@@ -172,7 +172,7 @@ nlm_bind_host(struct nlm_host *host) 
			(unsigned)ntohl(host->h_addr.sin_addr.s_addr));



	/* Lock host handle */

	down(&host->h_sema);

	mutex_lock(&host->h_mutex);



	/* If we've already created an RPC client, check whether

	 * RPC rebind is required
@@ -204,12 +204,12 @@ nlm_bind_host(struct nlm_host *host) 
		host->h_rpcclnt = clnt;

	}



	up(&host->h_sema);

	mutex_unlock(&host->h_mutex);

	return clnt;



forgetit:

	printk("lockd: couldn't create RPC handle for %s\n", host->h_name);

	up(&host->h_sema);

	mutex_unlock(&host->h_mutex);

	return NULL;

}

include/linux/lockd/lockd.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct nlm_host { 
	u32			h_nsmstate;	/* true remote NSM state */

	u32			h_pidcount;	/* Pseudopids */

	atomic_t		h_count;	/* reference count */

	struct semaphore	h_sema;		/* mutex for pmap binding */

	struct mutex		h_mutex;	/* mutex for pmap binding */

	unsigned long		h_nextrebind;	/* next portmap call */

	unsigned long		h_expires;	/* eligible for GC */

	struct list_head	h_lockowners;	/* Lockowners for the client */