diff options
author | NeilBrown <neilb@suse.de> | 2007-03-06 04:42:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 12:30:26 -0500 |
commit | cda1fd4abd773216a888487af0170d0cc3d50454 (patch) | |
tree | aed6662bab1789a1698644f2e1d0db4255ecad67 /net/sunrpc | |
parent | 5a05ed73e1abfd7e0e7d474817245861deaa18af (diff) |
[PATCH] knfsd: fix recently introduced problem with shutting down a busy NFS server
When the last thread of nfsd exits, it shuts down all related sockets. It
currently uses svc_close_socket to do this, but that only is immediately
effective if the socket is not SK_BUSY.
If the socket is busy - i.e. if a request has arrived that has not yet been
processes - svc_close_socket is not effective and the shutdown process spins.
So create a new svc_force_close_socket which removes the SK_BUSY flag is set
and then calls svc_close_socket.
Also change some open-codes loops in svc_destroy to use
list_for_each_entry_safe.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/svc.c | 21 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 16 |
2 files changed, 24 insertions, 13 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 8353829bc5c6..f960b138236f 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -367,6 +367,7 @@ void | |||
367 | svc_destroy(struct svc_serv *serv) | 367 | svc_destroy(struct svc_serv *serv) |
368 | { | 368 | { |
369 | struct svc_sock *svsk; | 369 | struct svc_sock *svsk; |
370 | struct svc_sock *tmp; | ||
370 | 371 | ||
371 | dprintk("svc: svc_destroy(%s, %d)\n", | 372 | dprintk("svc: svc_destroy(%s, %d)\n", |
372 | serv->sv_program->pg_name, | 373 | serv->sv_program->pg_name, |
@@ -382,21 +383,17 @@ svc_destroy(struct svc_serv *serv) | |||
382 | 383 | ||
383 | del_timer_sync(&serv->sv_temptimer); | 384 | del_timer_sync(&serv->sv_temptimer); |
384 | 385 | ||
385 | while (!list_empty(&serv->sv_tempsocks)) { | 386 | list_for_each_entry_safe(svsk, tmp, &serv->sv_tempsocks, sk_list) |
386 | svsk = list_entry(serv->sv_tempsocks.next, | 387 | svc_force_close_socket(svsk); |
387 | struct svc_sock, | 388 | |
388 | sk_list); | ||
389 | svc_close_socket(svsk); | ||
390 | } | ||
391 | if (serv->sv_shutdown) | 389 | if (serv->sv_shutdown) |
392 | serv->sv_shutdown(serv); | 390 | serv->sv_shutdown(serv); |
393 | 391 | ||
394 | while (!list_empty(&serv->sv_permsocks)) { | 392 | list_for_each_entry_safe(svsk, tmp, &serv->sv_permsocks, sk_list) |
395 | svsk = list_entry(serv->sv_permsocks.next, | 393 | svc_force_close_socket(svsk); |
396 | struct svc_sock, | 394 | |
397 | sk_list); | 395 | BUG_ON(!list_empty(&serv->sv_permsocks)); |
398 | svc_close_socket(svsk); | 396 | BUG_ON(!list_empty(&serv->sv_tempsocks)); |
399 | } | ||
400 | 397 | ||
401 | cache_clean_deferred(serv); | 398 | cache_clean_deferred(serv); |
402 | 399 | ||
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index e957ce55fd91..f6e1eb1ea720 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -82,6 +82,7 @@ static void svc_delete_socket(struct svc_sock *svsk); | |||
82 | static void svc_udp_data_ready(struct sock *, int); | 82 | static void svc_udp_data_ready(struct sock *, int); |
83 | static int svc_udp_recvfrom(struct svc_rqst *); | 83 | static int svc_udp_recvfrom(struct svc_rqst *); |
84 | static int svc_udp_sendto(struct svc_rqst *); | 84 | static int svc_udp_sendto(struct svc_rqst *); |
85 | static void svc_close_socket(struct svc_sock *svsk); | ||
85 | 86 | ||
86 | static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk); | 87 | static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk); |
87 | static int svc_deferred_recv(struct svc_rqst *rqstp); | 88 | static int svc_deferred_recv(struct svc_rqst *rqstp); |
@@ -1787,7 +1788,7 @@ svc_delete_socket(struct svc_sock *svsk) | |||
1787 | spin_unlock_bh(&serv->sv_lock); | 1788 | spin_unlock_bh(&serv->sv_lock); |
1788 | } | 1789 | } |
1789 | 1790 | ||
1790 | void svc_close_socket(struct svc_sock *svsk) | 1791 | static void svc_close_socket(struct svc_sock *svsk) |
1791 | { | 1792 | { |
1792 | set_bit(SK_CLOSE, &svsk->sk_flags); | 1793 | set_bit(SK_CLOSE, &svsk->sk_flags); |
1793 | if (test_and_set_bit(SK_BUSY, &svsk->sk_flags)) | 1794 | if (test_and_set_bit(SK_BUSY, &svsk->sk_flags)) |
@@ -1800,6 +1801,19 @@ void svc_close_socket(struct svc_sock *svsk) | |||
1800 | svc_sock_put(svsk); | 1801 | svc_sock_put(svsk); |
1801 | } | 1802 | } |
1802 | 1803 | ||
1804 | void svc_force_close_socket(struct svc_sock *svsk) | ||
1805 | { | ||
1806 | set_bit(SK_CLOSE, &svsk->sk_flags); | ||
1807 | if (test_bit(SK_BUSY, &svsk->sk_flags)) { | ||
1808 | /* Waiting to be processed, but no threads left, | ||
1809 | * So just remove it from the waiting list | ||
1810 | */ | ||
1811 | list_del_init(&svsk->sk_ready); | ||
1812 | clear_bit(SK_BUSY, &svsk->sk_flags); | ||
1813 | } | ||
1814 | svc_close_socket(svsk); | ||
1815 | } | ||
1816 | |||
1803 | /** | 1817 | /** |
1804 | * svc_makesock - Make a socket for nfsd and lockd | 1818 | * svc_makesock - Make a socket for nfsd and lockd |
1805 | * @serv: RPC server structure | 1819 | * @serv: RPC server structure |