diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-05-20 19:57:38 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-05-20 19:57:38 -0400 |
| commit | 68432a03f8ff93a9eecee95cc8f02e7fe2025cc9 (patch) | |
| tree | 9a9e98a0233a7f3b4d66df19d8ded26d0b41c0ed /net/sunrpc/svc_xprt.c | |
| parent | d71a4dd72e67210ae0767ccae69c79f1c933ff64 (diff) | |
| parent | a6f911c04e20b98feb4b33d3aba2976851977d6a (diff) | |
| download | kernel_samsung_espresso10-68432a03f8ff93a9eecee95cc8f02e7fe2025cc9.zip kernel_samsung_espresso10-68432a03f8ff93a9eecee95cc8f02e7fe2025cc9.tar.gz kernel_samsung_espresso10-68432a03f8ff93a9eecee95cc8f02e7fe2025cc9.tar.bz2 | |
Merge branch 'from-tomtucker' into for-2.6.26
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
| -rw-r--r-- | net/sunrpc/svc_xprt.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index d8e8d79..e46c825 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -6,30 +6,9 @@ #include <linux/sched.h> #include <linux/errno.h> -#include <linux/fcntl.h> -#include <linux/net.h> -#include <linux/in.h> -#include <linux/inet.h> -#include <linux/udp.h> -#include <linux/tcp.h> -#include <linux/unistd.h> -#include <linux/slab.h> -#include <linux/netdevice.h> -#include <linux/skbuff.h> -#include <linux/file.h> #include <linux/freezer.h> #include <linux/kthread.h> #include <net/sock.h> -#include <net/checksum.h> -#include <net/ip.h> -#include <net/ipv6.h> -#include <net/tcp_states.h> -#include <linux/uaccess.h> -#include <asm/ioctls.h> - -#include <linux/sunrpc/types.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/xdr.h> #include <linux/sunrpc/stats.h> #include <linux/sunrpc/svc_xprt.h> @@ -296,8 +275,6 @@ void svc_xprt_enqueue(struct svc_xprt *xprt) if (!(xprt->xpt_flags & ((1<<XPT_CONN)|(1<<XPT_DATA)|(1<<XPT_CLOSE)|(1<<XPT_DEFERRED)))) return; - if (test_bit(XPT_DEAD, &xprt->xpt_flags)) - return; cpu = get_cpu(); pool = svc_pool_for_cpu(xprt->xpt_server, cpu); |