[PATCH] staging: lustre: Use %ld to format long

[PATCH] staging: lustre: Use %ld to format long

[Geert Uytterhoeven]

drivers/staging/lustre/lustre/llite/rw26.c: In function ‘ll_direct_IO_26’:
drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 6 has type ‘long int’
drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 10 has type ‘long int’

Introduced by commit b41a1fe067c34b40736860458b9d62b2139471d5 ("staging:
lustre: Use %zd to format ssize_t"), which was part of a series to fix
issues in -next. However, the commits introducing the issues never made it
to mainline.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 55ca8d3c3e46..5b944d3fb80c 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -386,7 +386,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
 		return -EINVAL;
 
 	CDEBUG(D_VFSTRACE,
-	       "VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n",
+	       "VFS Op:inode=%lu/%u(%p), size=%ld (max %lu), offset=%lld=%llx, pages %ld (max %lu)\n",
 	       inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
 	       file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
 	       MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
-- 
1.9.1

Re: [PATCH] staging: lustre: Use %ld to format long

[Geert Uytterhoeven]

Hi Greg,

On Wed, Jun 11, 2014 at 7:00 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> drivers/staging/lustre/lustre/llite/rw26.c: In function ‘ll_direct_IO_26’:
> drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 6 has type ‘long int’
> drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 10 has type ‘long int’
>
> Introduced by commit b41a1fe067c34b40736860458b9d62b2139471d5 ("staging:
> lustre: Use %zd to format ssize_t"), which was part of a series to fix
> issues in -next. However, the commits introducing the issues never made it
> to mainline.

They have now, so please drop this patch.

> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  drivers/staging/lustre/lustre/llite/rw26.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
> index 55ca8d3c3e46..5b944d3fb80c 100644
> --- a/drivers/staging/lustre/lustre/llite/rw26.c
> +++ b/drivers/staging/lustre/lustre/llite/rw26.c
> @@ -386,7 +386,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb,
>                 return -EINVAL;
>
>         CDEBUG(D_VFSTRACE,
> -              "VFS Op:inode=%lu/%u(%p), size=%zd (max %lu), offset=%lld=%llx, pages %zd (max %lu)\n",
> +              "VFS Op:inode=%lu/%u(%p), size=%ld (max %lu), offset=%lld=%llx, pages %ld (max %lu)\n",
>                inode->i_ino, inode->i_generation, inode, count, MAX_DIO_SIZE,
>                file_offset, file_offset, count >> PAGE_CACHE_SHIFT,
>                MAX_DIO_SIZE >> PAGE_CACHE_SHIFT);
> --
> 1.9.1

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

Re: [PATCH] staging: lustre: Use %ld to format long

[Greg Kroah-Hartman]

On Mon, Jun 16, 2014 at 08:59:45AM +0200, Geert Uytterhoeven wrote:
> Hi Greg,
> 
> On Wed, Jun 11, 2014 at 7:00 PM, Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > drivers/staging/lustre/lustre/llite/rw26.c: In function ‘ll_direct_IO_26’:
> > drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 6 has type ‘long int’
> > drivers/staging/lustre/lustre/llite/rw26.c:388: warning: format ‘%zd’ expects type ‘signed size_t’, but argument 10 has type ‘long int’
> >
> > Introduced by commit b41a1fe067c34b40736860458b9d62b2139471d5 ("staging:
> > lustre: Use %zd to format ssize_t"), which was part of a series to fix
> > issues in -next. However, the commits introducing the issues never made it
> > to mainline.
> 
> They have now, so please drop this patch.

Now dropped :)