Commit 37a03472 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds

[PATCH] knfsd: call lockd_down when closing a socket via a write to nfsd/portlist

The refcount that nfsd holds on lockd is based on the number of open sockets.
So when we close a socket, we should decrement the ref (with lockd_down).

Currently when a socket is closed via writing to the portlist file, that
doesn't happen.

So: make sure we get an error return if the socket that was requested does is
not found, and call lockd_down if it was.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
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 7ed94296
...@@ -545,6 +545,8 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size) ...@@ -545,6 +545,8 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
if (nfsd_serv) if (nfsd_serv)
len = svc_sock_names(buf, nfsd_serv, toclose); len = svc_sock_names(buf, nfsd_serv, toclose);
unlock_kernel(); unlock_kernel();
if (len >= 0)
lockd_down();
kfree(toclose); kfree(toclose);
return len; return len;
} }
......
...@@ -493,6 +493,8 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose) ...@@ -493,6 +493,8 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
spin_unlock(&serv->sv_lock); spin_unlock(&serv->sv_lock);
if (closesk) if (closesk)
svc_delete_socket(closesk); svc_delete_socket(closesk);
else if (toclose)
return -ENOENT;
return len; return len;
} }
EXPORT_SYMBOL(svc_sock_names); EXPORT_SYMBOL(svc_sock_names);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment