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

Commit f0737a39 authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

[PATCH] knfsd: misc minor fixes, indentation changes 



cleans up some code in lockd/host.c, fixes an error printk and makes it a
fatal BUG if nlmsvc_free_host_resources fails.

Signed-off-by: default avatarOlaf Kirch <okir@suse.de>
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 8dead0db

fs/lockd/host.c

+6 −9
Original line number Diff line number Diff line
@@ -110,16 +110,13 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin, 
		if (host->h_server != server)

			continue;



		{

		if (hp != nlm_hosts + hash) {

			*hp = host->h_next;

			host->h_next = nlm_hosts[hash];

			nlm_hosts[hash] = host;

		}

		nlm_get_host(host);

			mutex_unlock(&nlm_host_mutex);

			return host;

		}

		goto out;

	}



	/* Sadly, the host isn't in our hash table yet. See if

fs/lockd/svcsubs.c

+5 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, 
	 * the file.

	 */

	if ((nfserr = nlmsvc_ops->fopen(rqstp, f, &file->f_file)) != 0) {

		dprintk("lockd: open failed (nfserr %d)\n", ntohl(nfserr));

		dprintk("lockd: open failed (error %d)\n", nfserr);

		goto out_free;

	}
@@ -313,10 +313,12 @@ nlmsvc_free_host_resources(struct nlm_host *host) 
{

	dprintk("lockd: nlmsvc_free_host_resources\n");



	if (nlm_traverse_files(host, NLM_ACT_UNLOCK))

	if (nlm_traverse_files(host, NLM_ACT_UNLOCK)) {

		printk(KERN_WARNING

			"lockd: couldn't remove all locks held by %s",

			"lockd: couldn't remove all locks held by %s\n",

			host->h_name);

		BUG();

	}

}



/*