[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/12] virtiofs: Fixup printf args
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 04/12] virtiofs: Fixup printf args |
Date: |
Thu, 6 May 2021 19:56:33 +0100 |
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>
Message-Id: <20210428110100.27757-2-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
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 2c36f4ec46..93a49db3cd 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);
@@ -3102,9 +3102,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
- [PULL 00/12] virtiofs queue, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 01/12] virtiofsd: Fix side-effect in assert(), Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 02/12] virtiofsd: Allow use "-o xattrmap" without "-o xattr", Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 04/12] virtiofs: Fixup printf args,
Dr. David Alan Gilbert (git) <=
- [PULL 05/12] virtiofsd: Don't assume header layout, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 03/12] virtiofsd: Add help for -o xattr-mapping, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 06/12] virtiofsd: Changed allocations of fuse_req to GLib functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 07/12] virtiofsd: Changed allocations of iovec to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 08/12] virtiofsd: Changed allocations of fuse_session to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 11/12] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 12/12] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 10/12] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions, Dr. David Alan Gilbert (git), 2021/05/06
- [PULL 09/12] virtiofsd: Changed allocation of lo_map_elems to GLib's functions, Dr. David Alan Gilbert (git), 2021/05/06
- Re: [PULL 00/12] virtiofs queue, Peter Maydell, 2021/05/11