diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-08-13 22:40:15 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-08-13 22:40:15 -0400 |
| commit | 80c21ca370306137d14fd0a6da9fcc3ce898b298 (patch) | |
| tree | a2bcfd424bf3908f39b4578b232cead1d41da7f3 /lib | |
| parent | c920def92d302fcdac3f4186276f4771b5e1b609 (diff) | |
| parent | f25b334c5093a1a5e2985c7ed58213a52ba06329 (diff) | |
| download | e2fsprogs-80c21ca370306137d14fd0a6da9fcc3ce898b298.tar.gz | |
Merge branch 'maint' into next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/support/mkquota.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c index 00f3a406e..931a839dd 100644 --- a/lib/support/mkquota.c +++ b/lib/support/mkquota.c @@ -50,11 +50,13 @@ static void print_dquot(const char *desc, struct dquot *dq) { if (desc) fprintf(stderr, "%s: ", desc); - fprintf(stderr, "%u %ld:%ld:%ld %ld:%ld:%ld\n", - dq->dq_id, dq->dq_dqb.dqb_curspace, - dq->dq_dqb.dqb_bsoftlimit, dq->dq_dqb.dqb_bhardlimit, - dq->dq_dqb.dqb_curinodes, - dq->dq_dqb.dqb_isoftlimit, dq->dq_dqb.dqb_ihardlimit); + fprintf(stderr, "%u %lld:%lld:%lld %lld:%lld:%lld\n", + dq->dq_id, (long long) dq->dq_dqb.dqb_curspace, + (long long) dq->dq_dqb.dqb_bsoftlimit, + (long long) dq->dq_dqb.dqb_bhardlimit, + (long long) dq->dq_dqb.dqb_curinodes, + (long long) dq->dq_dqb.dqb_isoftlimit, + (long long) dq->dq_dqb.dqb_ihardlimit); } #else static void print_dquot(const char *desc EXT2FS_ATTR((unused)), @@ -524,11 +526,11 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data) dq->dq_dqb.dqb_curinodes != dquot->dq_dqb.dqb_curinodes) { scan_data->usage_is_inconsistent = 1; fprintf(stderr, "[QUOTA WARNING] Usage inconsistent for ID %u:" - "actual (%ld, %ld) != expected (%ld, %ld)\n", - dq->dq_id, dq->dq_dqb.dqb_curspace, - dq->dq_dqb.dqb_curinodes, - dquot->dq_dqb.dqb_curspace, - dquot->dq_dqb.dqb_curinodes); + "actual (%lld, %lld) != expected (%lld, %lld)\n", + dq->dq_id, (long long) dq->dq_dqb.dqb_curspace, + (long long) dq->dq_dqb.dqb_curinodes, + (long long) dquot->dq_dqb.dqb_curspace, + (long long) dquot->dq_dqb.dqb_curinodes); } if (scan_data->update_limits) { |