The patch titled
Correctly close old nfsd/lockd sockets
has been removed from the -mm tree. Its filename was
correctly-close-old-nfsd-lockd-sockets.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Correctly close old nfsd/lockd sockets
From: Neil Brown <neilb@xxxxxxx>
Commit aaf68cfbf2241d24d46583423f6bff5c47e088b3 added a bias to sk_inuse,
so this test for an unused socket now fails. So no sockets gets closed
because they are old (they might get closed if the client closed them).
This bug has existed since 2.6.21-rc1.
Thanks to Wolfgang Walter for finding and reporting the bug.
Cc: Wolfgang Walter <wolfgang.walter@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sunrpc/svcsock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/sunrpc/svcsock.c~correctly-close-old-nfsd-lockd-sockets net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c~correctly-close-old-nfsd-lockd-sockets
+++ a/net/sunrpc/svcsock.c
@@ -1594,7 +1594,8 @@ svc_age_temp_sockets(unsigned long closu
if (!test_and_set_bit(SK_OLD, &svsk->sk_flags))
continue;
- if (atomic_read(&svsk->sk_inuse) || test_bit(SK_BUSY, &svsk->sk_flags))
+ if (atomic_read(&svsk->sk_inuse) > 1
+ || test_bit(SK_BUSY, &svsk->sk_flags))
continue;
atomic_inc(&svsk->sk_inuse);
list_move(le, &to_be_aged);
_
Patches currently in -mm which might be from neilb@xxxxxxx are
origin.patch
git-nfsd.patch
mm-revert-kernel_ds-buffered-write-optimisation.patch
fs-nfsd-exportc-make-3-functions-static.patch
md-software-raid-autodetect-dev-list-not-array.patch
md-software-raid-autodetect-dev-list-not-array-fix.patch
bitmaph-remove-dead-artifacts.patch
sysctl-remove-broken-sunrpc-debug-binary-sysctls.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
