aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-11-25 09:31:30 -0500
committerMark Fasheh <mfasheh@suse.com>2009-01-05 11:40:25 -0500
commit9a2f3866c825c67c3a5806799cdc93fb7517f0c4 (patch)
tree2b3e9621ef8e9c7b75e8a05408b7754c7881564f /fs/ocfs2
parent53a3604610e92a5344cf8003c19975583e71a598 (diff)
ocfs2: Fix build warnings (64-bit types vs long long)
fs/ocfs2/quota_local.c: In function 'olq_set_dquot': fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 7 has type '__le64' fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 8 has type '__le64' fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 7 has type '__le64' fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 8 has type '__le64' fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 7 has type '__le64' fs/ocfs2/quota_local.c:844: warning: format '%lld' expects type 'long long int', but argument 8 has type '__le64' fs/ocfs2/quota_global.c: In function '__ocfs2_sync_dquot': fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 8 has type 's64' fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 10 has type 's64' fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 8 has type 's64' fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 10 has type 's64' fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 8 has type 's64' fs/ocfs2/quota_global.c:457: warning: format '%lld' expects type 'long long int', but argument 10 has type 's64' Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/quota_global.c6
-rw-r--r--fs/ocfs2/quota_local.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
index e527ec6e0133..054d52bd8258 100644
--- a/fs/ocfs2/quota_global.c
+++ b/fs/ocfs2/quota_global.c
@@ -457,9 +457,9 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing)
457 olditime = dquot->dq_dqb.dqb_itime; 457 olditime = dquot->dq_dqb.dqb_itime;
458 oldbtime = dquot->dq_dqb.dqb_btime; 458 oldbtime = dquot->dq_dqb.dqb_btime;
459 ocfs2_global_disk2memdqb(dquot, &dqblk); 459 ocfs2_global_disk2memdqb(dquot, &dqblk);
460 mlog(0, "Syncing global dquot %d space %lld+%lld, inodes %lld+%lld\n", 460 mlog(0, "Syncing global dquot %u space %lld+%lld, inodes %lld+%lld\n",
461 dquot->dq_id, dquot->dq_dqb.dqb_curspace, spacechange, 461 dquot->dq_id, dquot->dq_dqb.dqb_curspace, (long long)spacechange,
462 dquot->dq_dqb.dqb_curinodes, inodechange); 462 dquot->dq_dqb.dqb_curinodes, (long long)inodechange);
463 if (!test_bit(DQ_LASTSET_B + QIF_SPACE_B, &dquot->dq_flags)) 463 if (!test_bit(DQ_LASTSET_B + QIF_SPACE_B, &dquot->dq_flags))
464 dquot->dq_dqb.dqb_curspace += spacechange; 464 dquot->dq_dqb.dqb_curspace += spacechange;
465 if (!test_bit(DQ_LASTSET_B + QIF_INODES_B, &dquot->dq_flags)) 465 if (!test_bit(DQ_LASTSET_B + QIF_INODES_B, &dquot->dq_flags))
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c
index 7053664f66a6..b5ddb22e6278 100644
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
@@ -848,7 +848,8 @@ static void olq_set_dquot(struct buffer_head *bh, void *private)
848 od->dq_originodes); 848 od->dq_originodes);
849 spin_unlock(&dq_data_lock); 849 spin_unlock(&dq_data_lock);
850 mlog(0, "Writing local dquot %u space %lld inodes %lld\n", 850 mlog(0, "Writing local dquot %u space %lld inodes %lld\n",
851 od->dq_dquot.dq_id, dqblk->dqb_spacemod, dqblk->dqb_inodemod); 851 od->dq_dquot.dq_id, (long long)le64_to_cpu(dqblk->dqb_spacemod),
852 (long long)le64_to_cpu(dqblk->dqb_inodemod));
852} 853}
853 854
854/* Write dquot to local quota file */ 855/* Write dquot to local quota file */