The patch titled
knfsd-move-tempsock-aging-to-a-timer-tidy
has been removed from the -mm tree. Its filename is
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
This patch was dropped because it was folded into knfsd-move-tempsock-aging-to-a-timer.patch
------------------------------------------------------
Subject: knfsd-move-tempsock-aging-to-a-timer-tidy
From: Andrew Morton <akpm@xxxxxxxx>
Cc: Greg Banks <gnb@xxxxxxxxxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/sunrpc/svcsock.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN net/sunrpc/svcsock.c~knfsd-move-tempsock-aging-to-a-timer-tidy net/sunrpc/svcsock.c
--- a/net/sunrpc/svcsock.c~knfsd-move-tempsock-aging-to-a-timer-tidy
+++ a/net/sunrpc/svcsock.c
@@ -1438,10 +1438,10 @@ svc_setup_socket(struct svc_serv *serv,
serv->sv_tmpcnt++;
if (serv->sv_temptimer.function == NULL) {
/* setup timer to age temp sockets */
- serv->sv_temptimer.function = svc_age_temp_sockets;
- serv->sv_temptimer.data = (unsigned long)serv;
- serv->sv_temptimer.expires = jiffies + svc_conn_age_period * HZ;
- add_timer(&serv->sv_temptimer);
+ setup_timer(&serv->sv_temptimer, svc_age_temp_sockets,
+ (unsigned long)serv);
+ mod_timer(&serv->sv_temptimer,
+ jiffies + svc_conn_age_period * HZ);
}
} else {
clear_bit(SK_TEMP, &svsk->sk_flags);
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
list-module-taint-flags-in-oops-panic.patch
move-pidmap-to-pspaceh.patch
isdn-work-around-excessive-udelay.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports.patch
knfsd-drop-serv-option-to-svc_recv-and-svc_process.patch
knfsd-move-tempsock-aging-to-a-timer.patch
knfsd-move-tempsock-aging-to-a-timer-tidy.patch
namespaces-add-nsproxy.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
rename-the-provided-execve-functions-to-kernel_execve-headers-fix.patch
replace-cad_pid-by-a-struct-pid-fixes.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
