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

Commit 493b87e5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Felix Blyakher
Browse files

xfs: fix warnings with CONFIG_XFS_QUOTA disabled 



Fix warnings about unitialized dquot variables by making sure
xfs_qm_vop_dqalloc touches it even when quotas are disabled.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
parent 7747a0b0

fs/xfs/xfs_quota.h

+8 −1
Original line number Diff line number Diff line
@@ -335,6 +335,14 @@ extern void xfs_qm_unmount(struct xfs_mount *); 
extern void xfs_qm_unmount_quotas(struct xfs_mount *);



#else

static inline int

xfs_qm_vop_dqalloc(struct xfs_inode *ip, uid_t uid, gid_t gid, prid_t prid,

		uint flags, struct xfs_dquot **udqp, struct xfs_dquot **gdqp)

{

	*udqp = NULL;

	*gdqp = NULL;

	return 0;

}

#define xfs_trans_dup_dqinfo(tp, tp2)

#define xfs_trans_free_dqinfo(tp)

#define xfs_trans_mod_dquot_byino(tp, ip, fields, delta)
@@ -342,7 +350,6 @@ extern void xfs_qm_unmount_quotas(struct xfs_mount *); 
#define xfs_trans_unreserve_and_mod_dquots(tp)

#define xfs_trans_reserve_quota_nblks(tp, ip, nblks, ninos, flags)	(0)

#define xfs_trans_reserve_quota_bydquots(tp, mp, u, g, nb, ni, fl)	(0)

#define xfs_qm_vop_dqalloc(ip, uid, gid, prid, fl, ou, og)		(0)

#define xfs_qm_vop_create_dqattach(tp, ip, u, g)

#define xfs_qm_vop_rename_dqattach(it)					(0)

#define xfs_qm_vop_chown(tp, ip, old, new)				(NULL)