Re: [PATCH -next 2/2] bcache: Use max_t() when comparing different types

[Geert Uytterhoeven <geert@linux-m68k.org>]

On Thu, Feb 6, 2014 at 9:38 PM, Andrew Morton <akpm@linux-foundation.org> wrote:
>> On Thu, 2014-02-06 at 10:00 +0100, Geert Uytterhoeven wrote:
>> > On Mon, Feb 3, 2014 at 2:47 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> > > On Wed, Jan 15, 2014 at 12:06 PM, Joe Perches <joe@perches.com> wrote:
>> > >> On Wed, 2014-01-15 at 10:06 +0100, Geert Uytterhoeven wrote:
>> > >>> drivers/md/bcache/btree.c: In function ___insert_u64s_remaining___:
>> > >>> drivers/md/bcache/btree.c:1816: warning: comparison of distinct pointer types lacks a cast
>> > >> []
>> > >>> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
>> > >> []
>> > >>> @@ -1813,7 +1813,7 @@ static size_t insert_u64s_remaining(struct btree *b)
>> > >>>       if (b->keys.ops->is_extents)
>> > >>>               ret -= KEY_MAX_U64S;
>> > >>>
>> > >>> -     return max(ret, 0L);
>> > >>> +     return max_t(ssize_t, ret, 0L);
>> > >>
>> > >> why not
>> > >>         return max(ret, 0);
>> > >
>> > > Indeed, that also works, on both 32-bit and 64-bit.
>> > > Will resend, now all the issues moved from -next to Linus' tree.
>> >
>> > However, sparse doesn't like it, so we'll have to go for v1?
>>
>> Seems so.
>
> Kent, was there any secret reason why insert_u64s_remaining():ret has
> type ssize_t?  The function returns size_t and
> bch_btree_keys_u64s_remaining() returns size_t so I think I'll do the
> obvious:
>
>
> --- a/drivers/md/bcache/btree.c~bcache-drop-l-suffix-when-comparing-ssize_t-with-0-fix
> +++ a/drivers/md/bcache/btree.c
> @@ -1805,7 +1805,7 @@ static bool btree_insert_key(struct btre
>
>  static size_t insert_u64s_remaining(struct btree *b)
>  {
> -       ssize_t ret = bch_btree_keys_u64s_remaining(&b->keys);
> +       size_t ret = bch_btree_keys_u64s_remaining(&b->keys);
>
>         /*
>          * Might land in the middle of an existing extent and have to split it
> @@ -1813,7 +1813,7 @@ static size_t insert_u64s_remaining(stru
>         if (b->keys.ops->is_extents)
>                 ret -= KEY_MAX_U64S;

I think the reason is the line above: with size_t, ret may become a big
positive number when the subtraction wraps below zero.

>
> -       return max(ret, 0);
> +       return max_t(size_t, ret, 0);

That part is OK, cfr. my v1 (which I had planned to send out as v3 again).

>  }
>
>  static bool bch_btree_insert_keys(struct btree *b, struct btree_op *op,

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds