projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[powerpc.git]
/
net
/
sunrpc
/
svcsock.c
diff --git
a/net/sunrpc/svcsock.c
b/net/sunrpc/svcsock.c
index
1a89992
..
c75bffe
100644
(file)
--- a/
net/sunrpc/svcsock.c
+++ b/
net/sunrpc/svcsock.c
@@
-19,6
+19,7
@@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/
+#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/fcntl.h>
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/fcntl.h>
@@
-103,7
+104,7
@@
static struct lock_class_key svc_slock_key[2];
static inline void svc_reclassify_socket(struct socket *sock)
{
struct sock *sk = sock->sk;
static inline void svc_reclassify_socket(struct socket *sock)
{
struct sock *sk = sock->sk;
- BUG_ON(s
k->sk_lock.owner != NULL
);
+ BUG_ON(s
ock_owned_by_user(sk)
);
switch (sk->sk_family) {
case AF_INET:
sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
switch (sk->sk_family) {
case AF_INET:
sock_lock_init_class_and_name(sk, "slock-AF_INET-NFSD",
@@
-877,7
+878,7
@@
svc_udp_recvfrom(struct svc_rqst *rqstp)
} else {
rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0].iov_len;
rqstp->rq_respages = rqstp->rq_pages + 1 +
} else {
rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0].iov_len;
rqstp->rq_respages = rqstp->rq_pages + 1 +
-
(rqstp->rq_arg.page_len + PAGE_SIZE - 1)/ PAGE_SIZE
;
+
DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE)
;
}
if (serv->sv_stats)
}
if (serv->sv_stats)
@@
-1110,7
+1111,8
@@
svc_tcp_accept(struct svc_sock *svsk)
serv->sv_name);
printk(KERN_NOTICE
"%s: last TCP connect from %s\n",
serv->sv_name);
printk(KERN_NOTICE
"%s: last TCP connect from %s\n",
- serv->sv_name, buf);
+ serv->sv_name, __svc_print_addr(sin,
+ buf, sizeof(buf)));
}
/*
* Always select the oldest socket. It's not fair,
}
/*
* Always select the oldest socket. It's not fair,