From: Neil Brown <neilb@suse.de>
Date: Mon, 1 Mar 2010 03:01:05 +0000 (-0500)
Subject: nfsd: ensure sockets are closed on error
X-Git-Tag: v2.6.34-rc1~27^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=301e99ce4a2f42a317129230fd42e6cd874c64b0;p=pandora-kernel.git

nfsd: ensure sockets are closed on error

One the changes in commit d7979ae4a "svc: Move close processing to a
single place" is:

  err_delete:
-       svc_delete_socket(svsk);
+       set_bit(SK_CLOSE, &svsk->sk_flags);
        return -EAGAIN;

This is insufficient. The recvfrom methods must always call
svc_xprt_received on completion so that the socket gets re-queued if
there is any more work to do.  This particular path did not make that
call because it actually destroyed the svsk, making requeue pointless.
When the svc_delete_socket was change to just set a bit, we should have
added a call to svc_xprt_received,

This is the problem that b0401d7253 attempted to fix, incorrectly.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

Reading git-diff-tree failed