diff mbox series

[v3,01/26] virtiofs: Fixup printf args

Message ID 20210428110100.27757-2-dgilbert@redhat.com
State New
Headers show
Series virtiofs dax patches | expand

Commit Message

Dr. David Alan Gilbert April 28, 2021, 11 a.m. UTC 
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

Fixup some fuse_log printf args for 32bit compatibility.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tools/virtiofsd/passthrough_ll.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

Comments

Stefan Hajnoczi May 4, 2021, 2:54 p.m. UTC | #1 
On Wed, Apr 28, 2021 at 12:00:35PM +0100, Dr. David Alan Gilbert (git) wrote:
> @@ -3097,9 +3097,10 @@ static void lo_copy_file_range(fuse_req_t req, fuse_ino_t ino_in, off_t off_in,
>  
>      fuse_log(FUSE_LOG_DEBUG,
>               "lo_copy_file_range(ino=%" PRIu64 "/fd=%d, "
> -             "off=%lu, ino=%" PRIu64 "/fd=%d, "
> -             "off=%lu, size=%zd, flags=0x%x)\n",
> -             ino_in, in_fd, off_in, ino_out, out_fd, off_out, len, flags);
> +             "off=%ju, ino=%" PRIu64 "/fd=%d, "
> +             "off=%ju, size=%zd, flags=0x%x)\n",
> +             ino_in, in_fd, (intmax_t)off_in,
> +             ino_out, out_fd, (intmax_t)off_out, len, flags);

The rest of the patch used uint64_t. Why intmax_t here?

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Dr. David Alan Gilbert May 5, 2021, 11:06 a.m. UTC | #2 
* Stefan Hajnoczi (stefanha@redhat.com) wrote:
> On Wed, Apr 28, 2021 at 12:00:35PM +0100, Dr. David Alan Gilbert (git) wrote:
> > @@ -3097,9 +3097,10 @@ static void lo_copy_file_range(fuse_req_t req, fuse_ino_t ino_in, off_t off_in,
> >  
> >      fuse_log(FUSE_LOG_DEBUG,
> >               "lo_copy_file_range(ino=%" PRIu64 "/fd=%d, "
> > -             "off=%lu, ino=%" PRIu64 "/fd=%d, "
> > -             "off=%lu, size=%zd, flags=0x%x)\n",
> > -             ino_in, in_fd, off_in, ino_out, out_fd, off_out, len, flags);
> > +             "off=%ju, ino=%" PRIu64 "/fd=%d, "
> > +             "off=%ju, size=%zd, flags=0x%x)\n",
> > +             ino_in, in_fd, (intmax_t)off_in,
> > +             ino_out, out_fd, (intmax_t)off_out, len, flags);
> 
> The rest of the patch used uint64_t. Why intmax_t here?

Because it seems to be the standard way of doing it for things that may
be off_t.

> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks.

Dave
Dr. David Alan Gilbert May 6, 2021, 3:56 p.m. UTC | #3 
* Dr. David Alan Gilbert (git) (dgilbert@redhat.com) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> Fixup some fuse_log printf args for 32bit compatibility.
> 
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

queued this 1/26 only

> ---
>  tools/virtiofsd/passthrough_ll.c | 21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
> index 1553d2ef45..110f85a701 100644
> --- a/tools/virtiofsd/passthrough_ll.c
> +++ b/tools/virtiofsd/passthrough_ll.c
> @@ -2011,10 +2011,10 @@ static void lo_getlk(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,
>  
>      fuse_log(FUSE_LOG_DEBUG,
>               "lo_getlk(ino=%" PRIu64 ", flags=%d)"
> -             " owner=0x%lx, l_type=%d l_start=0x%lx"
> -             " l_len=0x%lx\n",
> -             ino, fi->flags, fi->lock_owner, lock->l_type, lock->l_start,
> -             lock->l_len);
> +             " owner=0x%" PRIx64 ", l_type=%d l_start=0x%" PRIx64
> +             " l_len=0x%" PRIx64 "\n",
> +             ino, fi->flags, fi->lock_owner, lock->l_type,
> +             (uint64_t)lock->l_start, (uint64_t)lock->l_len);
>  
>      if (!lo->posix_lock) {
>          fuse_reply_err(req, ENOSYS);
> @@ -2061,10 +2061,10 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,
>  
>      fuse_log(FUSE_LOG_DEBUG,
>               "lo_setlk(ino=%" PRIu64 ", flags=%d)"
> -             " cmd=%d pid=%d owner=0x%lx sleep=%d l_whence=%d"
> -             " l_start=0x%lx l_len=0x%lx\n",
> +             " cmd=%d pid=%d owner=0x%" PRIx64 " sleep=%d l_whence=%d"
> +             " l_start=0x%" PRIx64 " l_len=0x%" PRIx64 "\n",
>               ino, fi->flags, lock->l_type, lock->l_pid, fi->lock_owner, sleep,
> -             lock->l_whence, lock->l_start, lock->l_len);
> +             lock->l_whence, (uint64_t)lock->l_start, (uint64_t)lock->l_len);
>  
>      if (!lo->posix_lock) {
>          fuse_reply_err(req, ENOSYS);
> @@ -3097,9 +3097,10 @@ static void lo_copy_file_range(fuse_req_t req, fuse_ino_t ino_in, off_t off_in,
>  
>      fuse_log(FUSE_LOG_DEBUG,
>               "lo_copy_file_range(ino=%" PRIu64 "/fd=%d, "
> -             "off=%lu, ino=%" PRIu64 "/fd=%d, "
> -             "off=%lu, size=%zd, flags=0x%x)\n",
> -             ino_in, in_fd, off_in, ino_out, out_fd, off_out, len, flags);
> +             "off=%ju, ino=%" PRIu64 "/fd=%d, "
> +             "off=%ju, size=%zd, flags=0x%x)\n",
> +             ino_in, in_fd, (intmax_t)off_in,
> +             ino_out, out_fd, (intmax_t)off_out, len, flags);
>  
>      res = copy_file_range(in_fd, &off_in, out_fd, &off_out, len, flags);
>      if (res < 0) {
> -- 
> 2.31.1
> 
>
diff mbox series

Patch

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 1553d2ef45..110f85a701 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -2011,10 +2011,10 @@  static void lo_getlk(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,
 
     fuse_log(FUSE_LOG_DEBUG,
              "lo_getlk(ino=%" PRIu64 ", flags=%d)"
-             " owner=0x%lx, l_type=%d l_start=0x%lx"
-             " l_len=0x%lx\n",
-             ino, fi->flags, fi->lock_owner, lock->l_type, lock->l_start,
-             lock->l_len);
+             " owner=0x%" PRIx64 ", l_type=%d l_start=0x%" PRIx64
+             " l_len=0x%" PRIx64 "\n",
+             ino, fi->flags, fi->lock_owner, lock->l_type,
+             (uint64_t)lock->l_start, (uint64_t)lock->l_len);
 
     if (!lo->posix_lock) {
         fuse_reply_err(req, ENOSYS);
@@ -2061,10 +2061,10 @@  static void lo_setlk(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi,
 
     fuse_log(FUSE_LOG_DEBUG,
              "lo_setlk(ino=%" PRIu64 ", flags=%d)"
-             " cmd=%d pid=%d owner=0x%lx sleep=%d l_whence=%d"
-             " l_start=0x%lx l_len=0x%lx\n",
+             " cmd=%d pid=%d owner=0x%" PRIx64 " sleep=%d l_whence=%d"
+             " l_start=0x%" PRIx64 " l_len=0x%" PRIx64 "\n",
              ino, fi->flags, lock->l_type, lock->l_pid, fi->lock_owner, sleep,
-             lock->l_whence, lock->l_start, lock->l_len);
+             lock->l_whence, (uint64_t)lock->l_start, (uint64_t)lock->l_len);
 
     if (!lo->posix_lock) {
         fuse_reply_err(req, ENOSYS);
@@ -3097,9 +3097,10 @@  static void lo_copy_file_range(fuse_req_t req, fuse_ino_t ino_in, off_t off_in,
 
     fuse_log(FUSE_LOG_DEBUG,
              "lo_copy_file_range(ino=%" PRIu64 "/fd=%d, "
-             "off=%lu, ino=%" PRIu64 "/fd=%d, "
-             "off=%lu, size=%zd, flags=0x%x)\n",
-             ino_in, in_fd, off_in, ino_out, out_fd, off_out, len, flags);
+             "off=%ju, ino=%" PRIu64 "/fd=%d, "
+             "off=%ju, size=%zd, flags=0x%x)\n",
+             ino_in, in_fd, (intmax_t)off_in,
+             ino_out, out_fd, (intmax_t)off_out, len, flags);
 
     res = copy_file_range(in_fd, &off_in, out_fd, &off_out, len, flags);
     if (res < 0) {