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

Commit 5680c446 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: Fixed handling of lockd fail when adding nfsd socket 



Arrgg..  We cannot 'lockd_up' before 'svc_addsock' as we don't know the
protocol yet....  So switch it around again and save the name of the created
sockets so that it can be closed if lock_up fails.

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 cda9e0cd

fs/nfsd/nfsctl.c

+6 −6
Original line number Diff line number Diff line
@@ -523,11 +523,11 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size) 
		err = nfsd_create_serv();

		if (!err) {

			int proto = 0;

			err = lockd_up(proto);

			if (!err) {

			err = svc_addsock(nfsd_serv, fd, buf, &proto);

				if (err)

					lockd_down();

			if (err >= 0) {

				err = lockd_up(proto);

				if (err < 0)

					svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);

			}

			/* Decrease the count, but don't shutdown the

			 * the service
@@ -536,7 +536,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size) 
			nfsd_serv->sv_nrthreads--;

			unlock_kernel();

		}

		return err;

		return err < 0 ? err : 0;

	}

	if (buf[0] == '-') {

		char *toclose = kstrdup(buf+1, GFP_KERNEL);

net/sunrpc/svcsock.c

+3 −0
Original line number Diff line number Diff line
@@ -492,6 +492,9 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose) 
	}

	spin_unlock(&serv->sv_lock);

	if (closesk)

		/* Should unregister with portmap, but you cannot

		 * unregister just one protocol...

		 */

		svc_delete_socket(closesk);

	else if (toclose)

		return -ENOENT;