Quell another sparse warning.
Signed-off-by: Trond Myklebust <[email protected]>
---
net/sunrpc/xdr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)
}
EXPORT_SYMBOL_GPL(xdr_commit_encode);
-__be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, size_t nbytes)
+static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
+ size_t nbytes)
{
static __be32 *p;
int space_left;
--
1.9.3
On Wed, Jul 16, 2014 at 02:40:43PM -0700, Trond Myklebust wrote:
> On Wed, Jul 16, 2014 at 1:58 PM, Bruce Fields <[email protected]> wrote:
> > On Sat, Jul 12, 2014 at 06:01:02PM -0400, Trond Myklebust wrote:
> >> Quell another sparse warning.
> >
> > I think jlayton sent you the same fix with his set of sunrpc sparse
> > fixes--could you just take that instead?
> >
> > (Or I can take this if you still want, I don't really care.)
>
> I wasn't planning on carrying either patch in my tree. I've offloaded
> the merge job to you... :-)
> IOW: feel free to take Jeff's patch if that is more convenient.
OK, are you taking the rest of that series or should I get that too?
--b.
On Sat, Jul 12, 2014 at 06:01:02PM -0400, Trond Myklebust wrote:
> Quell another sparse warning.
I think jlayton sent you the same fix with his set of sunrpc sparse
fixes--could you just take that instead?
(Or I can take this if you still want, I don't really care.)
--b.
>
> Signed-off-by: Trond Myklebust <[email protected]>
> ---
> net/sunrpc/xdr.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> 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)
> }
> EXPORT_SYMBOL_GPL(xdr_commit_encode);
>
> -__be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr, size_t nbytes)
> +static __be32 *xdr_get_next_encode_buffer(struct xdr_stream *xdr,
> + size_t nbytes)
> {
> static __be32 *p;
> int space_left;
> --
> 1.9.3
>
On Sat, Jul 12, 2014 at 06:01:02PM -0400, Trond Myklebust wrote:
> Quell another sparse warning.
>
> Signed-off-by: Trond Myklebust <[email protected]>
Looks good,
Reviewed-by: Christoph Hellwig <[email protected]>
On Wed, Jul 16, 2014 at 05:44:55PM -0400, Bruce Fields wrote:
> On Wed, Jul 16, 2014 at 02:40:43PM -0700, Trond Myklebust wrote:
> > On Wed, Jul 16, 2014 at 1:58 PM, Bruce Fields <[email protected]> wrote:
> > > On Sat, Jul 12, 2014 at 06:01:02PM -0400, Trond Myklebust wrote:
> > >> Quell another sparse warning.
> > >
> > > I think jlayton sent you the same fix with his set of sunrpc sparse
> > > fixes--could you just take that instead?
> > >
> > > (Or I can take this if you still want, I don't really care.)
> >
> > I wasn't planning on carrying either patch in my tree. I've offloaded
> > the merge job to you... :-)
> > IOW: feel free to take Jeff's patch if that is more convenient.
>
> OK, are you taking the rest of that series or should I get that too?
(Applying the one patch, assuming the resti s yours.)
--b.
On Wed, Jul 16, 2014 at 1:58 PM, Bruce Fields <[email protected]> wrote:
> On Sat, Jul 12, 2014 at 06:01:02PM -0400, Trond Myklebust wrote:
>> Quell another sparse warning.
>
> I think jlayton sent you the same fix with his set of sunrpc sparse
> fixes--could you just take that instead?
>
> (Or I can take this if you still want, I don't really care.)
I wasn't planning on carrying either patch in my tree. I've offloaded
the merge job to you... :-)
IOW: feel free to take Jeff's patch if that is more convenient.
Cheers,
Trond
--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]