On Tue, Mar 13, 2012 at 03:03:54PM -0500, Ben Myers wrote: > Hey Christoph, > > On Tue, Mar 13, 2012 at 04:52:36AM -0400, Christoph Hellwig wrote: > > Instead of keeping a separate per-filesystem list of dquots we can walk > > the radix tree for the two places where we need to iterate all quota > > structures. > > > > Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx> > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > > > > --- > > fs/xfs/xfs_dquot.c | 37 ++---- > > fs/xfs/xfs_dquot.h | 3 > > fs/xfs/xfs_qm.c | 283 +++++++++++++++++++++++------------------------------ > > fs/xfs/xfs_qm.h | 4 > > 4 files changed, 142 insertions(+), 185 deletions(-) > > > > V2: remove the useless flags/type argument to the iterator callbacks > > > > ... > > > Index: xfs/fs/xfs/xfs_qm.c > > =================================================================== > > --- xfs.orig/fs/xfs/xfs_qm.c 2012-03-13 09:37:53.236788274 +0100 > > +++ xfs/fs/xfs/xfs_qm.c 2012-03-13 09:39:32.823456788 +0100 > > @@ -169,6 +169,196 @@ xfs_qm_rele_quotafs_ref( > > } > > > > /* > > + * We use the batch lookup interface to iterate over the dquots as it > > + * currently is the only interface into the radix tree code that allows > > + * fuzzy lookups instead of exact matches. Holding the lock over multiple > > + * operations is fine as all callers are used either during mount/umount > > + * or quotaoff. > > + */ > > +#define XFS_DQ_LOOKUP_BATCH 32 > > + > > +STATIC int > > +xfs_qm_dquot_walk( > > + struct xfs_mount *mp, > > + int type, > > + int (*execute)(struct xfs_dquot *dqp)) > > +{ > > + struct xfs_quotainfo *qi = mp->m_quotainfo; > > + struct radix_tree_root *tree = XFS_DQUOT_TREE(qi, type); > > + uint32_t next_index; > > + int last_error = 0; > > + int skipped; > > + int nr_found; > > + > > +restart: > > + skipped = 0; > > + next_index = 0; > > + nr_found = 0; > > + > > + while (1) { > > + struct xfs_dquot *batch[XFS_DQ_LOOKUP_BATCH]; > > Eesh.. that probably doesn't need to go onto the stack. I know we are > doing it elsewhere too, and that we also sometimes complain about other > peoples' stack usage. Don't necessarily have to clean it up now, > though. ;) Actually, if we do the walk from the shrinker we can't reliably allocate it, so it has to go on the stack. That being said, there are optimised generic radix tree walk methods being worked on, so this will go away soon... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs