From: Benny Halevy <bhalevy@xxxxxxxxxx>
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxx>
---
ctl.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ctl.c b/ctl.c
index d989ab8..e5d16e3 100644
--- a/ctl.c
+++ b/ctl.c
@@ -75,11 +75,10 @@ struct event ge;
int
main(int argc, char **argv)
{
- int upcall_fd,
- operation = -1,
- len;
- char c,
- *prog;
+ int upcall_fd;
+ int operation = -1;
+ char c;
+ char *prog;
pthread_t t;
void *thr_val;
@@ -162,7 +161,7 @@ process_msg(int fd, short ev_type, void *arg)
return;
len = sizeof (bl_comm_res_t);
if ((cc = read(fd, &msg, sizeof (msg))) != sizeof (msg)) {
- printf("Failed to get all of message. Got %d, expected %d\n",
+ printf("Failed to get all of message. Got %d, expected %Zd\n",
cc, sizeof (msg));
resp->res_status = PNFS_BLOCK_FAILURE;
write(fd, resp, len);
@@ -352,9 +351,7 @@ get_dm(bl_comm_msg_t *msg, bl_comm_res_t *res, int *lenp)
bl_comm_res_t *
check_dm(bl_comm_msg_t *msg, bl_comm_res_t *res, int *len)
{
- int fd,
- major,
- minor;
+ int major, minor;
char *name;
res->res_status = PNFS_BLOCK_SUCCESS;
@@ -391,7 +388,7 @@ get_slice(bl_comm_msg_t *msg, bl_comm_res_t *res, int *len)
partition = minor & 0xf;
res->res_status = PNFS_BLOCK_FAILURE; // Default condition
- printf("%s: %u:%u: ", __func__, major, minor); fflush(stdout);
+ printf("%s: %u:%u: ", __func__, (unsigned)major, (unsigned)minor); fflush(stdout);
if (mknod(path, S_IFBLK | 0600, dev)) {
perror("mknod");
@@ -421,7 +418,8 @@ get_slice(bl_comm_msg_t *msg, bl_comm_res_t *res, int *len)
res->res_status = PNFS_BLOCK_SUCCESS;
res->u.slice.start = ppart->geom.start;
res->u.slice.length = ppart->geom.length;
- printf("Dev: %d:%d, Start: %llu, Length: %llu\n", major, minor,
+ printf("Dev: %u:%u, Start: %llu, Length: %llu\n",
+ (unsigned)major, (unsigned)minor,
res->u.slice.start, res->u.slice.length);
out:
(void) unlink(path);
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
