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

Commit 6b54dae2 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: lockd: fix refount on nsm 



If nlm_lookup_host finds what it is looking for it exits with an extra
reference on the matching 'nsm' structure.

So don't actually count the reference until we are (fairly) sure it is going
to be used.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b66285ce

fs/lockd/host.c

+4 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, 
			continue;



		/* See if we have an NSM handle for this client */

		if (!nsm && (nsm = host->h_nsmhandle) != 0)

			atomic_inc(&nsm->sm_count);

		if (!nsm)

			nsm = host->h_nsmhandle;



		if (host->h_proto != proto)

			continue;
@@ -120,6 +120,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, 
		nlm_get_host(host);

		goto out;

	}

	if (nsm)

		atomic_inc(&nsm->sm_count);



	host = NULL;