Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a2f3866 authored by Jan Kara's avatar Jan Kara Committed by Mark Fasheh
Browse files

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: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 53a36046

fs/ocfs2/quota_global.c

+3 −3
Original line number Diff line number Diff line
@@ -457,9 +457,9 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing) 
	olditime = dquot->dq_dqb.dqb_itime;

	oldbtime = dquot->dq_dqb.dqb_btime;

	ocfs2_global_disk2memdqb(dquot, &dqblk);

	mlog(0, "Syncing global dquot %d space %lld+%lld, inodes %lld+%lld\n",

	     dquot->dq_id, dquot->dq_dqb.dqb_curspace, spacechange,

	     dquot->dq_dqb.dqb_curinodes, inodechange);

	mlog(0, "Syncing global dquot %u space %lld+%lld, inodes %lld+%lld\n",

	     dquot->dq_id, dquot->dq_dqb.dqb_curspace, (long long)spacechange,

	     dquot->dq_dqb.dqb_curinodes, (long long)inodechange);

	if (!test_bit(DQ_LASTSET_B + QIF_SPACE_B, &dquot->dq_flags))

		dquot->dq_dqb.dqb_curspace += spacechange;

	if (!test_bit(DQ_LASTSET_B + QIF_INODES_B, &dquot->dq_flags))

fs/ocfs2/quota_local.c

+2 −1
Original line number Diff line number Diff line
@@ -848,7 +848,8 @@ static void olq_set_dquot(struct buffer_head *bh, void *private) 
					  od->dq_originodes);

	spin_unlock(&dq_data_lock);

	mlog(0, "Writing local dquot %u space %lld inodes %lld\n",

	     od->dq_dquot.dq_id, dqblk->dqb_spacemod, dqblk->dqb_inodemod);

	     od->dq_dquot.dq_id, (long long)le64_to_cpu(dqblk->dqb_spacemod),

	     (long long)le64_to_cpu(dqblk->dqb_inodemod));

}



/* Write dquot to local quota file */