diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/sunrpc/xdr.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/sunrpc/xdr.c')
| -rw-r--r-- | net/sunrpc/xdr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 23fb4e75e245..290af97bf6f9 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
| @@ -509,7 +509,8 @@ void xdr_commit_encode(struct xdr_stream *xdr) | |||
| 509 | } | 509 | } |
| 510 | EXPORT_SYMBOL_GPL(xdr_commit_encode); | 510 | EXPORT_SYMBOL_GPL(xdr_commit_encode); |
| 511 | 511 | ||
| 512 | __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, size_t nbytes) | 512 | static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, |
| 513 | size_t nbytes) | ||
| 513 | { | 514 | { |
| 514 | static __be32 *p; | 515 | static __be32 *p; |
| 515 | int space_left; | 516 | int space_left; |