Commit f7b9ee78 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: consolidate the xfs_quota_reserve_blkres definitions 



xfs_trans_reserve_quota_nblks is already stubbed out if quota support
is disabled, no need for an extra xfs_quota_reserve_blkres stub.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 67a841f9

fs/xfs/xfs_quota.h

+6 −12
Original line number Diff line number Diff line
@@ -123,12 +123,6 @@ extern int xfs_qm_newmount(struct xfs_mount *, uint *, uint *); 
extern void xfs_qm_mount_quotas(struct xfs_mount *);

extern void xfs_qm_unmount(struct xfs_mount *);

extern void xfs_qm_unmount_quotas(struct xfs_mount *);



static inline int

xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t blocks)

{

	return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0, false);

}

bool xfs_inode_near_dquot_enforcement(struct xfs_inode *ip, xfs_dqtype_t type);



# ifdef CONFIG_XFS_LIVE_HOOKS
@@ -187,12 +181,6 @@ static inline int xfs_trans_reserve_quota_bydquots(struct xfs_trans *tp, 
	return 0;

}



static inline int

xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t blocks)

{

	return 0;

}



static inline int

xfs_trans_reserve_quota_icreate(struct xfs_trans *tp, struct xfs_dquot *udqp,

		struct xfs_dquot *gdqp, struct xfs_dquot *pdqp, int64_t dblocks)
@@ -221,6 +209,12 @@ xfs_trans_reserve_quota_icreate(struct xfs_trans *tp, struct xfs_dquot *udqp, 


#endif /* CONFIG_XFS_QUOTA */



static inline int

xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t blocks)

{

	return xfs_trans_reserve_quota_nblks(NULL, ip, blocks, 0, false);

}



static inline int

xfs_quota_unreserve_blkres(struct xfs_inode *ip, int64_t blocks)

{