diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /net/sunrpc/xprt.c | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 02060d0e7be8..313b68d892c6 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
| @@ -908,9 +908,8 @@ static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc | |||
| 908 | struct rpc_xprt *xprt; | 908 | struct rpc_xprt *xprt; |
| 909 | struct rpc_rqst *req; | 909 | struct rpc_rqst *req; |
| 910 | 910 | ||
| 911 | if ((xprt = kmalloc(sizeof(struct rpc_xprt), GFP_KERNEL)) == NULL) | 911 | if ((xprt = kzalloc(sizeof(struct rpc_xprt), GFP_KERNEL)) == NULL) |
| 912 | return ERR_PTR(-ENOMEM); | 912 | return ERR_PTR(-ENOMEM); |
| 913 | memset(xprt, 0, sizeof(*xprt)); /* Nnnngh! */ | ||
| 914 | 913 | ||
| 915 | xprt->addr = *ap; | 914 | xprt->addr = *ap; |
| 916 | 915 | ||