| Message ID | 161100791039.88678.6897577495997060048.stgit@magnolia (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | xfs: minor cleanups of the quota functions | expand |
> - error = xfs_trans_reserve_quota_nblks(NULL, ip, (long)alen, 0, > - XFS_QMOPT_RES_REGBLKS); > + error = xfs_quota_reserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS); This is the only callsite outside of xfs_quota_unreserve_blkres, so I'm not sure how useful the wrapper is. Also even on the unreserved side we always pass XFS_QMOPT_RES_REGBLKS except for one case that conditionally passes XFS_QMOPT_RES_RTBLKS. So if we think these helpers are useful enough I'd at least just pass a bool is_rt argument and hide the flags entirely.
On Tue, Jan 19, 2021 at 07:44:03AM +0100, Christoph Hellwig wrote: > > - error = xfs_trans_reserve_quota_nblks(NULL, ip, (long)alen, 0, > > - XFS_QMOPT_RES_REGBLKS); > > + error = xfs_quota_reserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS); > > This is the only callsite outside of xfs_quota_unreserve_blkres, > so I'm not sure how useful the wrapper is. Also even on the unreserved > side we always pass XFS_QMOPT_RES_REGBLKS except for one case that > conditionally passes XFS_QMOPT_RES_RTBLKS. So if we think these helpers > are useful enough I'd at least just pass a bool is_rt argument and hide > the flags entirely. Seeing as XFS doesn't even let you mount with quota and rt, I elect to get rid of the third parameter entirely. Whoever decides to make them work together will have a lot of work to do beyond fixing that one unreserve call. --D
On Tue, Jan 19, 2021 at 11:47:19AM -0800, Darrick J. Wong wrote: > On Tue, Jan 19, 2021 at 07:44:03AM +0100, Christoph Hellwig wrote: > > > - error = xfs_trans_reserve_quota_nblks(NULL, ip, (long)alen, 0, > > > - XFS_QMOPT_RES_REGBLKS); > > > + error = xfs_quota_reserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS); > > > > This is the only callsite outside of xfs_quota_unreserve_blkres, > > so I'm not sure how useful the wrapper is. Also even on the unreserved > > side we always pass XFS_QMOPT_RES_REGBLKS except for one case that > > conditionally passes XFS_QMOPT_RES_RTBLKS. So if we think these helpers > > are useful enough I'd at least just pass a bool is_rt argument and hide > > the flags entirely. > > Seeing as XFS doesn't even let you mount with quota and rt, I elect to > get rid of the third parameter entirely. Whoever decides to make them > work together will have a lot of work to do beyond fixing that one > unreserve call. And having said that, I reverse myself, because looking at the rt reflink patchset I'll have to add that switch to the reserve/unreserve callers anyway. I'll change the last arg to 'bool isrt'. --D > --D
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 21076ac2485a..fa6b442eb75f 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4001,8 +4001,7 @@ xfs_bmapi_reserve_delalloc( * blocks. This number gets adjusted later. We return if we haven't * allocated blocks already inside this loop. */ - error = xfs_trans_reserve_quota_nblks(NULL, ip, (long)alen, 0, - XFS_QMOPT_RES_REGBLKS); + error = xfs_quota_reserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS); if (error) return error; @@ -4048,8 +4047,7 @@ xfs_bmapi_reserve_delalloc( xfs_mod_fdblocks(mp, alen, false); out_unreserve_quota: if (XFS_IS_QUOTA_ON(mp)) - xfs_trans_unreserve_quota_nblks(NULL, ip, (long)alen, 0, - XFS_QMOPT_RES_REGBLKS); + xfs_quota_unreserve_blkres(ip, alen, XFS_QMOPT_RES_REGBLKS); return error; } @@ -4826,7 +4824,7 @@ xfs_bmap_del_extent_delay( * sb counters as we might have to borrow some blocks for the * indirect block accounting. */ - error = xfs_trans_unreserve_quota_nblks(NULL, ip, del->br_blockcount, 0, + error = xfs_quota_unreserve_blkres(ip, del->br_blockcount, isrt ? XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS); if (error) return error; diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index bd28d17941e7..b1411d25c9e5 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h @@ -136,6 +136,11 @@ 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 nblks, unsigned int flags) +{ + return 0; +} #define xfs_qm_vop_create_dqattach(tp, ip, u, g, p) #define xfs_qm_vop_rename_dqattach(it) (0) #define xfs_qm_vop_chown(tp, ip, old, new) (NULL) @@ -162,6 +167,20 @@ xfs_trans_unreserve_quota_nblks(struct xfs_trans *tp, struct xfs_inode *ip, xfs_trans_reserve_quota_bydquots(tp, mp, ud, gd, pd, nb, ni, \ f | XFS_QMOPT_RES_REGBLKS) +static inline int +xfs_quota_reserve_blkres(struct xfs_inode *ip, int64_t nblks, + unsigned int flags) +{ + return xfs_trans_reserve_quota_nblks(NULL, ip, nblks, 0, flags); +} + +static inline int +xfs_quota_unreserve_blkres(struct xfs_inode *ip, int64_t nblks, + unsigned int flags) +{ + return xfs_quota_reserve_blkres(ip, -nblks, flags); +} + extern int xfs_mount_reset_sbqflags(struct xfs_mount *); #endif /* __XFS_QUOTA_H__ */ diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 20321d03e31c..1f3270ffaea5 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -508,8 +508,7 @@ xfs_reflink_cancel_cow_blocks( xfs_bmap_del_extent_cow(ip, &icur, &got, &del); /* Remove the quota reservation */ - error = xfs_trans_unreserve_quota_nblks(NULL, ip, - del.br_blockcount, 0, + error = xfs_quota_unreserve_blkres(ip, del.br_blockcount, XFS_QMOPT_RES_REGBLKS); if (error) break;