| Message ID | 2d87ba58-f713-6326-8683-29185155ee58@sandeen.net (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Wed, Apr 04, 2018 at 02:10:20PM -0500, Eric Sandeen wrote: > Factor out the time limit initialization from > xfs_qm_init_quotainfo so that we can delay it until > after quotacheck - it requires reading the default disk > quotas, which may need repair. > > No functional changes in this patch. You have 75 characters per line for your changelog, use them! Otherwise looks good: Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 4/5/18 2:15 AM, Christoph Hellwig wrote: > On Wed, Apr 04, 2018 at 02:10:20PM -0500, Eric Sandeen wrote: >> Factor out the time limit initialization from >> xfs_qm_init_quotainfo so that we can delay it until >> after quotacheck - it requires reading the default disk >> quotas, which may need repair. >> >> No functional changes in this patch. > > You have 75 characters per line for your changelog, use them! Sorry, bad habit. I never remember exactly how many and sometimes I just keep shortening... The public shaming should help, I'll try to do better. :) -Eric > Otherwise looks good: > > Reviewed-by: Christoph Hellwig <hch@lst.de> > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Apr 05, 2018 at 07:36:58AM -0500, Eric Sandeen wrote: > > > On 4/5/18 2:15 AM, Christoph Hellwig wrote: > > On Wed, Apr 04, 2018 at 02:10:20PM -0500, Eric Sandeen wrote: > >> Factor out the time limit initialization from > >> xfs_qm_init_quotainfo so that we can delay it until > >> after quotacheck - it requires reading the default disk > >> quotas, which may need repair. > >> > >> No functional changes in this patch. > > > > You have 75 characters per line for your changelog, use them! > > Sorry, bad habit. I never remember exactly how many and sometimes I just > keep shortening... If you use vim, set this up so you get automatic setting of the text width (with highlighting) depending on the editor context you are running: " set default text width and shortcut to set custom widths set textwidth=80 map #tw :set textwidth=<C-R>=col(".")<C-M> " set the textwidth to 68 characters for commit messages au BufNewFile,BufRead guilt.msg.*,.gitsendemail.*,git.*,*/.git/* set tw=68 " set the textwidth to 68 characters for replies (email&usenet) au BufNewFile,BufRead .letter,mutt*,nn.*,snd.* set tw=68 " highlight textwidth set cc=+1 -Dave.
On Wed, Apr 04, 2018 at 02:10:20PM -0500, Eric Sandeen wrote: > Factor out the time limit initialization from > xfs_qm_init_quotainfo so that we can delay it until > after quotacheck - it requires reading the default disk > quotas, which may need repair. > > No functional changes in this patch. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > > nb: the patch itself looks weird, what it really does is move the > timelimit setting /up/ in the file. You just have to squint > at it. > > fs/xfs/xfs_qm.c | 91 ++++++++++++++++++++++++++++++++------------------------- > 1 file changed, 51 insertions(+), 40 deletions(-) > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > index 328d770..a4da46c 100644 > --- a/fs/xfs/xfs_qm.c > +++ b/fs/xfs/xfs_qm.c > @@ -594,47 +594,13 @@ struct xfs_qm_isolate { > } > } > > -/* > - * This initializes all the quota information that's kept in the > - * mount structure > - */ > -STATIC int > -xfs_qm_init_quotainfo( > - xfs_mount_t *mp) > +STATIC void > +xfs_qm_set_timelimits( > + struct xfs_mount *mp, > + struct xfs_quotainfo *qinf) > { > - xfs_quotainfo_t *qinf; > - int error; > - xfs_dquot_t *dqp; > - > - ASSERT(XFS_IS_QUOTA_RUNNING(mp)); > - > - qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); > - > - error = list_lru_init(&qinf->qi_lru); > - if (error) > - goto out_free_qinf; > - > - /* > - * See if quotainodes are setup, and if not, allocate them, > - * and change the superblock accordingly. > - */ > - error = xfs_qm_init_quotainos(mp); > - if (error) > - goto out_free_lru; > - > - INIT_RADIX_TREE(&qinf->qi_uquota_tree, GFP_NOFS); > - INIT_RADIX_TREE(&qinf->qi_gquota_tree, GFP_NOFS); > - INIT_RADIX_TREE(&qinf->qi_pquota_tree, GFP_NOFS); > - mutex_init(&qinf->qi_tree_lock); > - > - /* mutex used to serialize quotaoffs */ > - mutex_init(&qinf->qi_quotaofflock); > - > - /* Precalc some constants */ > - qinf->qi_dqchunklen = XFS_FSB_TO_BB(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); > - qinf->qi_dqperchunk = xfs_calc_dquots_per_chunk(qinf->qi_dqchunklen); > - > - mp->m_qflags |= (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_CHKD); > + int error; > + xfs_dquot_t *dqp; > > /* > * We try to get the limits from the superuser's limits fields. > @@ -691,6 +657,51 @@ struct xfs_qm_isolate { > xfs_qm_set_defquota(mp, XFS_DQ_PROJ, qinf); > > qinf->qi_shrinker.count_objects = xfs_qm_shrink_count; > +} > + > +/* > + * This initializes all the quota information that's kept in the > + * mount structure > + */ > +STATIC int > +xfs_qm_init_quotainfo( > + xfs_mount_t *mp) > +{ > + xfs_quotainfo_t *qinf; > + int error; > + > + ASSERT(XFS_IS_QUOTA_RUNNING(mp)); > + > + qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); > + > + error = list_lru_init(&qinf->qi_lru); > + if (error) > + goto out_free_qinf; > + > + /* > + * See if quotainodes are setup, and if not, allocate them, > + * and change the superblock accordingly. > + */ > + error = xfs_qm_init_quotainos(mp); > + if (error) > + goto out_free_lru; > + > + INIT_RADIX_TREE(&qinf->qi_uquota_tree, GFP_NOFS); > + INIT_RADIX_TREE(&qinf->qi_gquota_tree, GFP_NOFS); > + INIT_RADIX_TREE(&qinf->qi_pquota_tree, GFP_NOFS); > + mutex_init(&qinf->qi_tree_lock); > + > + /* mutex used to serialize quotaoffs */ > + mutex_init(&qinf->qi_quotaofflock); > + > + /* Precalc some constants */ > + qinf->qi_dqchunklen = XFS_FSB_TO_BB(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); > + qinf->qi_dqperchunk = xfs_calc_dquots_per_chunk(qinf->qi_dqchunklen); > + > + mp->m_qflags |= (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_CHKD); > + > + xfs_qm_set_timelimits(mp, qinf); > + > qinf->qi_shrinker.scan_objects = xfs_qm_shrink_scan; > qinf->qi_shrinker.seeks = DEFAULT_SEEKS; > qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE; > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 328d770..a4da46c 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -594,47 +594,13 @@ struct xfs_qm_isolate { } } -/* - * This initializes all the quota information that's kept in the - * mount structure - */ -STATIC int -xfs_qm_init_quotainfo( - xfs_mount_t *mp) +STATIC void +xfs_qm_set_timelimits( + struct xfs_mount *mp, + struct xfs_quotainfo *qinf) { - xfs_quotainfo_t *qinf; - int error; - xfs_dquot_t *dqp; - - ASSERT(XFS_IS_QUOTA_RUNNING(mp)); - - qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); - - error = list_lru_init(&qinf->qi_lru); - if (error) - goto out_free_qinf; - - /* - * See if quotainodes are setup, and if not, allocate them, - * and change the superblock accordingly. - */ - error = xfs_qm_init_quotainos(mp); - if (error) - goto out_free_lru; - - INIT_RADIX_TREE(&qinf->qi_uquota_tree, GFP_NOFS); - INIT_RADIX_TREE(&qinf->qi_gquota_tree, GFP_NOFS); - INIT_RADIX_TREE(&qinf->qi_pquota_tree, GFP_NOFS); - mutex_init(&qinf->qi_tree_lock); - - /* mutex used to serialize quotaoffs */ - mutex_init(&qinf->qi_quotaofflock); - - /* Precalc some constants */ - qinf->qi_dqchunklen = XFS_FSB_TO_BB(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); - qinf->qi_dqperchunk = xfs_calc_dquots_per_chunk(qinf->qi_dqchunklen); - - mp->m_qflags |= (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_CHKD); + int error; + xfs_dquot_t *dqp; /* * We try to get the limits from the superuser's limits fields. @@ -691,6 +657,51 @@ struct xfs_qm_isolate { xfs_qm_set_defquota(mp, XFS_DQ_PROJ, qinf); qinf->qi_shrinker.count_objects = xfs_qm_shrink_count; +} + +/* + * This initializes all the quota information that's kept in the + * mount structure + */ +STATIC int +xfs_qm_init_quotainfo( + xfs_mount_t *mp) +{ + xfs_quotainfo_t *qinf; + int error; + + ASSERT(XFS_IS_QUOTA_RUNNING(mp)); + + qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP); + + error = list_lru_init(&qinf->qi_lru); + if (error) + goto out_free_qinf; + + /* + * See if quotainodes are setup, and if not, allocate them, + * and change the superblock accordingly. + */ + error = xfs_qm_init_quotainos(mp); + if (error) + goto out_free_lru; + + INIT_RADIX_TREE(&qinf->qi_uquota_tree, GFP_NOFS); + INIT_RADIX_TREE(&qinf->qi_gquota_tree, GFP_NOFS); + INIT_RADIX_TREE(&qinf->qi_pquota_tree, GFP_NOFS); + mutex_init(&qinf->qi_tree_lock); + + /* mutex used to serialize quotaoffs */ + mutex_init(&qinf->qi_quotaofflock); + + /* Precalc some constants */ + qinf->qi_dqchunklen = XFS_FSB_TO_BB(mp, XFS_DQUOT_CLUSTER_SIZE_FSB); + qinf->qi_dqperchunk = xfs_calc_dquots_per_chunk(qinf->qi_dqchunklen); + + mp->m_qflags |= (mp->m_sb.sb_qflags & XFS_ALL_QUOTA_CHKD); + + xfs_qm_set_timelimits(mp, qinf); + qinf->qi_shrinker.scan_objects = xfs_qm_shrink_scan; qinf->qi_shrinker.seeks = DEFAULT_SEEKS; qinf->qi_shrinker.flags = SHRINKER_NUMA_AWARE;
Factor out the time limit initialization from xfs_qm_init_quotainfo so that we can delay it until after quotacheck - it requires reading the default disk quotas, which may need repair. No functional changes in this patch. Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- nb: the patch itself looks weird, what it really does is move the timelimit setting /up/ in the file. You just have to squint at it. fs/xfs/xfs_qm.c | 91 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 40 deletions(-)