| Message ID | 20240328070256.2918605-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] xfs: check if_bytes under the ilock in xfs_reflink_end_cow_extent | expand |
On Thu, Mar 28, 2024 at 08:02:52AM +0100, Christoph Hellwig wrote: > 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: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/xfs/xfs_quota.h | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h > index 85a4ae1a17f672..621ea9d7cf06d9 100644 > --- a/fs/xfs/xfs_quota.h > +++ b/fs/xfs/xfs_quota.h > @@ -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) > { > -- > 2.39.2 > >
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index 85a4ae1a17f672..621ea9d7cf06d9 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h @@ -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) {
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: Christoph Hellwig <hch@lst.de> --- fs/xfs/xfs_quota.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)