cifs: smbd: Fix printk format warning for iov on the stack

Message ID 1524562495-28137-1-git-send-email-matt.redfearn@mips.com
State New
Headers show
Series
  • cifs: smbd: Fix printk format warning for iov on the stack
Related show

Commit Message

Matt Redfearn April 24, 2018, 9:34 a.m.
Commit 4863cc758216 ("cifs: smbd: Avoid allocating iov on the stack")
(next-20180424) added a warning when the pdu size is not as expected,
but used a %lu for the printk warning. This results in the following
warning being emitted from MIPS allyesconfig builds:

fs/cifs/smbdirect.c:2106:3: warning: format '%lu' expects argument of
type 'long unsigned int', but argument 4 has type 'size_t' [-Wformat=]

Change the format specifier to %zu for the size_t argument.

Fixes: 4863cc758216 ("cifs: smbd: Avoid allocating iov on the stack")
Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>

---

This is new in next-20180424. Feel free to squash this if possible
before it hits master.

---
 fs/cifs/smbdirect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steve French April 24, 2018, 11:33 p.m. | #1
Updated the original patch with Matt's suggestion and added him on CC
and repushed to cifs-2.6.git for-next

On Tue, Apr 24, 2018 at 4:34 AM, Matt Redfearn <matt.redfearn@mips.com> wrote:
> Commit 4863cc758216 ("cifs: smbd: Avoid allocating iov on the stack")
> (next-20180424) added a warning when the pdu size is not as expected,
> but used a %lu for the printk warning. This results in the following
> warning being emitted from MIPS allyesconfig builds:
>
> fs/cifs/smbdirect.c:2106:3: warning: format '%lu' expects argument of
> type 'long unsigned int', but argument 4 has type 'size_t' [-Wformat=]
>
> Change the format specifier to %zu for the size_t argument.
>
> Fixes: 4863cc758216 ("cifs: smbd: Avoid allocating iov on the stack")
> Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
>
> ---
>
> This is new in next-20180424. Feel free to squash this if possible
> before it hits master.
>
> ---
>  fs/cifs/smbdirect.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
> index 24cea63e17f5..c62f7c95683c 100644
> --- a/fs/cifs/smbdirect.c
> +++ b/fs/cifs/smbdirect.c
> @@ -2103,7 +2103,7 @@ int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
>          */
>
>         if (rqst->rq_iov[0].iov_len != 4) {
> -               log_write(ERR, "expected the pdu length in 1st iov, but got %lu\n", rqst->rq_iov[0].iov_len);
> +               log_write(ERR, "expected the pdu length in 1st iov, but got %zu\n", rqst->rq_iov[0].iov_len);
>                 return -EINVAL;
>         }
>         iov = &rqst->rq_iov[1];
> --
> 2.7.4
>

Patch

diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 24cea63e17f5..c62f7c95683c 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -2103,7 +2103,7 @@  int smbd_send(struct smbd_connection *info, struct smb_rqst *rqst)
 	 */
 
 	if (rqst->rq_iov[0].iov_len != 4) {
-		log_write(ERR, "expected the pdu length in 1st iov, but got %lu\n", rqst->rq_iov[0].iov_len);
+		log_write(ERR, "expected the pdu length in 1st iov, but got %zu\n", rqst->rq_iov[0].iov_len);
 		return -EINVAL;
 	}
 	iov = &rqst->rq_iov[1];