projects / packages / nfs-utils.git / blame
| Commit | Line | Data |
|---|---|---|
| 41c5b638 JB |
1 | --- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.orig 2019-11-29 16:50:34.858389742 +0100 |
| 2 | +++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2019-11-29 16:50:38.298371106 +0100 | |
| 3 | @@ -378,7 +378,7 @@ | |
| 4 | bsize = cld_message_size(cmsg); | |
| 5 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 6 | if (wsize != bsize) | |
| 7 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 8 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 9 | __func__, wsize); | |
| 10 | ||
| 11 | /* reopen pipe, just to be sure */ | |
| 12 | @@ -409,7 +409,7 @@ | |
| 13 | xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); | |
| 14 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 15 | if (wsize != bsize) { | |
| 16 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 17 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 18 | __func__, wsize); | |
| 19 | ret = cld_pipe_open(clnt); | |
| 20 | if (ret) { | |
| 21 | @@ -459,7 +459,7 @@ | |
| 22 | xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); | |
| 23 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 24 | if (wsize != bsize) { | |
| 25 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 26 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 27 | __func__, wsize); | |
| 28 | ret = cld_pipe_open(clnt); | |
| 29 | if (ret) { | |
| 30 | @@ -498,7 +498,7 @@ | |
| 31 | cmsg->cm_status); | |
| 32 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 33 | if (wsize != bsize) { | |
| 34 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 35 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 36 | __func__, wsize); | |
| 37 | ret = cld_pipe_open(clnt); | |
| 38 | if (ret) { | |
| 39 | @@ -548,7 +548,7 @@ | |
| 40 | cmsg->cm_status); | |
| 41 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 42 | if (wsize != bsize) { | |
| 43 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 44 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 45 | __func__, wsize); | |
| 46 | ret = cld_pipe_open(clnt); | |
| 47 | if (ret) { | |
| 48 | @@ -607,7 +607,7 @@ | |
| 49 | xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); | |
| 50 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 51 | if (wsize != bsize) { | |
| 52 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 53 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 54 | __func__, wsize); | |
| 55 | ret = cld_pipe_open(clnt); | |
| 56 | if (ret) { | |
| 57 | @@ -667,7 +667,7 @@ | |
| 58 | xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); | |
| 59 | wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); | |
| 60 | if (wsize != bsize) { | |
| 61 | - xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", | |
| 62 | + xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m", | |
| 63 | __func__, wsize); | |
| 64 | ret = cld_pipe_open(clnt); | |
| 65 | if (ret) { | |
| 66 | --- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c.orig 2019-11-13 18:09:41.000000000 +0100 | |
| 67 | +++ nfs-utils-2.4.2/utils/nfsdcld/sqlite.c 2019-11-29 16:52:19.827821073 +0100 | |
| 68 | @@ -512,7 +512,7 @@ | |
| 69 | current_epoch = tcur; | |
| 70 | recovery_epoch = trec; | |
| 71 | ret = 0; | |
| 72 | - xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", | |
| 73 | + xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, | |
| 74 | __func__, current_epoch, recovery_epoch); | |
| 75 | out: | |
| 76 | sqlite3_finalize(stmt); | |
| 77 | @@ -1223,7 +1223,7 @@ | |
| 78 | ||
| 79 | current_epoch = tcur; | |
| 80 | recovery_epoch = trec; | |
| 81 | - xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", | |
| 82 | + xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, | |
| 83 | __func__, current_epoch, recovery_epoch); | |
| 84 | ||
| 85 | out: | |
| 86 | @@ -1282,7 +1282,7 @@ | |
| 87 | } | |
| 88 | ||
| 89 | recovery_epoch = 0; | |
| 90 | - xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu", | |
| 91 | + xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64, | |
| 92 | __func__, current_epoch, recovery_epoch); | |
| 93 | ||
| 94 | out: | |
| b9dca77b JB |
95 | --- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.orig 2019-12-01 08:16:29.090420366 +0100 |
| 96 | +++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c 2019-12-01 08:16:36.084104443 +0100 | |
| 97 | @@ -525,7 +525,7 @@ | |
| 98 | if (*tail) | |
| 99 | return -EINVAL; | |
| 100 | ||
| 101 | - xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime); | |
| 102 | + xlog(D_GENERAL, "%s: grace done. gracetime=%lld", __func__, (uint64_t)gracetime); | |
| 103 | ||
| 104 | ret = sqlite_remove_unreclaimed(gracetime); | |
| 105 |