blktap2: remove warnings.

This patch removes the following warnings on ia64.

> linux-2.6.18-xen.hg/drivers/xen/blktap2/device.c: In function
  'blktap_device_finish_request':
> linux-2.6.18-xen.hg/drivers/xen/blktap2/device.c:403: warning:
  format '%lld' expects type 'long long int', but argument 7 has type 'uint64_t'
> linux-2.6.18-xen.hg/drivers/xen/blktap2/sysfs.c: In function
  'blktap_sysfs_debug_device':
> linux-2.6.18-xen.hg/drivers/xen/blktap2/sysfs.c:276: warning: format
  '%llu' expects type 'long long unsigned int', but argument 4 has type
  'uint64_t'

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/drivers/xen/blktap2/device.c b/drivers/xen/blktap2/device.c
index 3b5118dc81d297dccd57ab909c87c14690787653..90860de17723c02f3d2337756fa1578821eceebe 100644 (file)
--- a/drivers/xen/blktap2/device.c
+++ b/drivers/xen/blktap2/device.c
@@ -401,7 +401,8 @@ blktap_device_finish_request(struct blktap *tap,
        uptodate = (res->status == BLKIF_RSP_OKAY);
 
        BTDBG("req %p res status %d operation %d/%d id %lld\n", req,
-               res->status, res->operation, request->operation, res->id);
+             res->status, res->operation, request->operation,
+             (unsigned long long)res->id);
 
        switch (request->operation) {
        case BLKIF_OP_READ:

diff --git a/drivers/xen/blktap2/sysfs.c b/drivers/xen/blktap2/sysfs.c
index 5a2e098b3dcfcfb4046ea49fc974554ff08792d7..919a24677eab3fa62441980d846517e50ed4889c 100644 (file)
--- a/drivers/xen/blktap2/sysfs.c
+++ b/drivers/xen/blktap2/sysfs.c
@@ -270,7 +270,7 @@ blktap_sysfs_debug_device(struct class_device *dev, char *buf)
                tmp += sprintf(tmp, "req %d: id: %llu, usr_idx: %d, "
                               "status: 0x%02x, pendcnt: %d, "
                               "nr_pages: %u, op: %d, time: %lu:%lu\n",
-                              i, req->id, req->usr_idx,
+                              i, (unsigned long long)req->id, req->usr_idx,
                               req->status, atomic_read(&req->pendcnt),
                               req->nr_pages, req->operation, req->time.tv_sec,
                               req->time.tv_usec);