diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 16:40:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-03 16:40:37 -0800 |
| commit | 2433c41789d6aa6797ca747707b7764e88e4fb6d (patch) | |
| tree | a4f1706a1038bb8df671807c9ead0fa6abf9b4ed /net | |
| parent | cd92a17eec752f8c948c4b6ab93dc099ce55b8cb (diff) | |
| parent | a8d82d9b950213b66b22c9e7c63a058841de2394 (diff) | |
| download | op-kernel-dev-2433c41789d6aa6797ca747707b7764e88e4fb6d.zip op-kernel-dev-2433c41789d6aa6797ca747707b7764e88e4fb6d.tar.gz | |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
NLM: client-side nlm_lookup_host() should avoid matching on srcaddr
nfsd: use of unitialized list head on error exit in nfs4recover.c
Add a reference to sunrpc in svc_addsock
nfsd: clean up grace period on early exit
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/svcsock.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 95293f5..a1951dc 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1183,7 +1183,11 @@ int svc_addsock(struct svc_serv *serv, else if (so->state > SS_UNCONNECTED) err = -EISCONN; else { - svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS); + if (!try_module_get(THIS_MODULE)) + err = -ENOENT; + else + svsk = svc_setup_socket(serv, so, &err, + SVC_SOCK_DEFAULTS); if (svsk) { struct sockaddr_storage addr; struct sockaddr *sin = (struct sockaddr *)&addr; @@ -1196,7 +1200,8 @@ int svc_addsock(struct svc_serv *serv, spin_unlock_bh(&serv->sv_lock); svc_xprt_received(&svsk->sk_xprt); err = 0; - } + } else + module_put(THIS_MODULE); } if (err) { sockfd_put(so); |
