Messages in this thread Patches in this message | | | From | NeilBrown <> | Date | Thu, 24 Aug 2006 16:36:45 +1000 | Subject | [PATCH 003 of 11] 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: Neil Brown <neilb@suse.de>
### Diffstat output ./fs/nfsd/nfsctl.c | 2 ++ ./net/sunrpc/svcsock.c | 2 ++ 2 files changed, 4 insertions(+)
diff .prev/fs/nfsd/nfsctl.c ./fs/nfsd/nfsctl.c --- .prev/fs/nfsd/nfsctl.c 2006-08-24 16:24:21.000000000 +1000 +++ ./fs/nfsd/nfsctl.c 2006-08-24 16:24:21.000000000 +1000 @@ -545,6 +545,8 @@ static ssize_t write_ports(struct file * if (nfsd_serv) len = svc_sock_names(buf, nfsd_serv, toclose); unlock_kernel(); + if (len >= 0) + lockd_down(); kfree(toclose); return len; } diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c --- .prev/net/sunrpc/svcsock.c 2006-08-24 16:23:37.000000000 +1000 +++ ./net/sunrpc/svcsock.c 2006-08-24 16:24:21.000000000 +1000 @@ -493,6 +493,8 @@ svc_sock_names(char *buf, struct svc_ser spin_unlock(&serv->sv_lock); if (closesk) svc_delete_socket(closesk); + else if (toclose) + return -ENOENT; return len; } EXPORT_SYMBOL(svc_sock_names); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |