| Message ID | ca896e6a-9390-4ea8-ea70-642dba320686@redhat.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | xfs: quota timer enhancements | expand |
On Mon, May 18, 2020 at 01:49:42PM -0500, Eric Sandeen wrote: > There is a fair bit of whitespace damage in the quota code, so > fix up enough of it that subsequent patches are restricted to > functional change to aid review. > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > Reviewed-by: Allison Collins <allison.henderson@oracle.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > fs/xfs/xfs_dquot.c | 16 ++++++++-------- > fs/xfs/xfs_qm.h | 44 +++++++++++++++++++++---------------------- > fs/xfs/xfs_quotaops.c | 8 ++++---- > 3 files changed, 34 insertions(+), 34 deletions(-) > > diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c > index af2c8e5ceea0..96e33390c6a0 100644 > --- a/fs/xfs/xfs_dquot.c > +++ b/fs/xfs/xfs_dquot.c > @@ -205,16 +205,16 @@ xfs_qm_adjust_dqtimers( > */ > STATIC void > xfs_qm_init_dquot_blk( > - xfs_trans_t *tp, > - xfs_mount_t *mp, > - xfs_dqid_t id, > - uint type, > - xfs_buf_t *bp) > + struct xfs_trans *tp, > + struct xfs_mount *mp, > + xfs_dqid_t id, > + uint type, > + struct xfs_buf *bp) > { > struct xfs_quotainfo *q = mp->m_quotainfo; > - xfs_dqblk_t *d; > - xfs_dqid_t curid; > - int i; > + xfs_dqblk_t *d; > + xfs_dqid_t curid; > + int i; > > ASSERT(tp); > ASSERT(xfs_buf_islocked(bp)); > diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h > index 4e57edca8bce..3a850401b102 100644 > --- a/fs/xfs/xfs_qm.h > +++ b/fs/xfs/xfs_qm.h > @@ -42,12 +42,12 @@ extern struct kmem_zone *xfs_qm_dqtrxzone; > #define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1 > > struct xfs_def_quota { > - xfs_qcnt_t bhardlimit; /* default data blk hard limit */ > - xfs_qcnt_t bsoftlimit; /* default data blk soft limit */ > - xfs_qcnt_t ihardlimit; /* default inode count hard limit */ > - xfs_qcnt_t isoftlimit; /* default inode count soft limit */ > - xfs_qcnt_t rtbhardlimit; /* default realtime blk hard limit */ > - xfs_qcnt_t rtbsoftlimit; /* default realtime blk soft limit */ > + xfs_qcnt_t bhardlimit; /* default data blk hard limit */ > + xfs_qcnt_t bsoftlimit; /* default data blk soft limit */ > + xfs_qcnt_t ihardlimit; /* default inode count hard limit */ > + xfs_qcnt_t isoftlimit; /* default inode count soft limit */ > + xfs_qcnt_t rtbhardlimit; /* default realtime blk hard limit */ > + xfs_qcnt_t rtbsoftlimit; /* default realtime blk soft limit */ > }; > > /* > @@ -55,28 +55,28 @@ struct xfs_def_quota { > * The mount structure keeps a pointer to this. > */ > struct xfs_quotainfo { > - struct radix_tree_root qi_uquota_tree; > - struct radix_tree_root qi_gquota_tree; > - struct radix_tree_root qi_pquota_tree; > - struct mutex qi_tree_lock; > + struct radix_tree_root qi_uquota_tree; > + struct radix_tree_root qi_gquota_tree; > + struct radix_tree_root qi_pquota_tree; > + struct mutex qi_tree_lock; > struct xfs_inode *qi_uquotaip; /* user quota inode */ > struct xfs_inode *qi_gquotaip; /* group quota inode */ > struct xfs_inode *qi_pquotaip; /* project quota inode */ > - struct list_lru qi_lru; > - int qi_dquots; > - time64_t qi_btimelimit; /* limit for blks timer */ > - time64_t qi_itimelimit; /* limit for inodes timer */ > - time64_t qi_rtbtimelimit;/* limit for rt blks timer */ > - xfs_qwarncnt_t qi_bwarnlimit; /* limit for blks warnings */ > - xfs_qwarncnt_t qi_iwarnlimit; /* limit for inodes warnings */ > - xfs_qwarncnt_t qi_rtbwarnlimit;/* limit for rt blks warnings */ > - struct mutex qi_quotaofflock;/* to serialize quotaoff */ > - xfs_filblks_t qi_dqchunklen; /* # BBs in a chunk of dqs */ > - uint qi_dqperchunk; /* # ondisk dqs in above chunk */ > + struct list_lru qi_lru; > + int qi_dquots; > + time64_t qi_btimelimit; /* limit for blks timer */ > + time64_t qi_itimelimit; /* limit for inodes timer */ > + time64_t qi_rtbtimelimit;/* limit for rt blks timer */ > + xfs_qwarncnt_t qi_bwarnlimit; /* limit for blks warnings */ > + xfs_qwarncnt_t qi_iwarnlimit; /* limit for inodes warnings */ > + xfs_qwarncnt_t qi_rtbwarnlimit;/* limit for rt blks warnings */ > + struct mutex qi_quotaofflock;/* to serialize quotaoff */ > + xfs_filblks_t qi_dqchunklen; /* # BBs in a chunk of dqs */ > + uint qi_dqperchunk; /* # ondisk dq in above chunk */ > struct xfs_def_quota qi_usr_default; > struct xfs_def_quota qi_grp_default; > struct xfs_def_quota qi_prj_default; > - struct shrinker qi_shrinker; > + struct shrinker qi_shrinker; > }; > > static inline struct radix_tree_root * > diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c > index 38669e827206..cb16a91dd1d4 100644 > --- a/fs/xfs/xfs_quotaops.c > +++ b/fs/xfs/xfs_quotaops.c > @@ -23,8 +23,8 @@ xfs_qm_fill_state( > struct xfs_inode *ip, > xfs_ino_t ino) > { > - struct xfs_quotainfo *q = mp->m_quotainfo; > - bool tempqip = false; > + struct xfs_quotainfo *q = mp->m_quotainfo; > + bool tempqip = false; > > tstate->ino = ino; > if (!ip && ino == NULLFSINO) > @@ -109,8 +109,8 @@ xfs_fs_set_info( > int type, > struct qc_info *info) > { > - struct xfs_mount *mp = XFS_M(sb); > - struct qc_dqblk newlim; > + struct xfs_mount *mp = XFS_M(sb); > + struct qc_dqblk newlim; > > if (sb_rdonly(sb)) > return -EROFS; > -- > 2.17.0 >
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index af2c8e5ceea0..96e33390c6a0 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -205,16 +205,16 @@ xfs_qm_adjust_dqtimers( */ STATIC void xfs_qm_init_dquot_blk( - xfs_trans_t *tp, - xfs_mount_t *mp, - xfs_dqid_t id, - uint type, - xfs_buf_t *bp) + struct xfs_trans *tp, + struct xfs_mount *mp, + xfs_dqid_t id, + uint type, + struct xfs_buf *bp) { struct xfs_quotainfo *q = mp->m_quotainfo; - xfs_dqblk_t *d; - xfs_dqid_t curid; - int i; + xfs_dqblk_t *d; + xfs_dqid_t curid; + int i; ASSERT(tp); ASSERT(xfs_buf_islocked(bp)); diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h index 4e57edca8bce..3a850401b102 100644 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@ -42,12 +42,12 @@ extern struct kmem_zone *xfs_qm_dqtrxzone; #define XFS_DQUOT_CLUSTER_SIZE_FSB (xfs_filblks_t)1 struct xfs_def_quota { - xfs_qcnt_t bhardlimit; /* default data blk hard limit */ - xfs_qcnt_t bsoftlimit; /* default data blk soft limit */ - xfs_qcnt_t ihardlimit; /* default inode count hard limit */ - xfs_qcnt_t isoftlimit; /* default inode count soft limit */ - xfs_qcnt_t rtbhardlimit; /* default realtime blk hard limit */ - xfs_qcnt_t rtbsoftlimit; /* default realtime blk soft limit */ + xfs_qcnt_t bhardlimit; /* default data blk hard limit */ + xfs_qcnt_t bsoftlimit; /* default data blk soft limit */ + xfs_qcnt_t ihardlimit; /* default inode count hard limit */ + xfs_qcnt_t isoftlimit; /* default inode count soft limit */ + xfs_qcnt_t rtbhardlimit; /* default realtime blk hard limit */ + xfs_qcnt_t rtbsoftlimit; /* default realtime blk soft limit */ }; /* @@ -55,28 +55,28 @@ struct xfs_def_quota { * The mount structure keeps a pointer to this. */ struct xfs_quotainfo { - struct radix_tree_root qi_uquota_tree; - struct radix_tree_root qi_gquota_tree; - struct radix_tree_root qi_pquota_tree; - struct mutex qi_tree_lock; + struct radix_tree_root qi_uquota_tree; + struct radix_tree_root qi_gquota_tree; + struct radix_tree_root qi_pquota_tree; + struct mutex qi_tree_lock; struct xfs_inode *qi_uquotaip; /* user quota inode */ struct xfs_inode *qi_gquotaip; /* group quota inode */ struct xfs_inode *qi_pquotaip; /* project quota inode */ - struct list_lru qi_lru; - int qi_dquots; - time64_t qi_btimelimit; /* limit for blks timer */ - time64_t qi_itimelimit; /* limit for inodes timer */ - time64_t qi_rtbtimelimit;/* limit for rt blks timer */ - xfs_qwarncnt_t qi_bwarnlimit; /* limit for blks warnings */ - xfs_qwarncnt_t qi_iwarnlimit; /* limit for inodes warnings */ - xfs_qwarncnt_t qi_rtbwarnlimit;/* limit for rt blks warnings */ - struct mutex qi_quotaofflock;/* to serialize quotaoff */ - xfs_filblks_t qi_dqchunklen; /* # BBs in a chunk of dqs */ - uint qi_dqperchunk; /* # ondisk dqs in above chunk */ + struct list_lru qi_lru; + int qi_dquots; + time64_t qi_btimelimit; /* limit for blks timer */ + time64_t qi_itimelimit; /* limit for inodes timer */ + time64_t qi_rtbtimelimit;/* limit for rt blks timer */ + xfs_qwarncnt_t qi_bwarnlimit; /* limit for blks warnings */ + xfs_qwarncnt_t qi_iwarnlimit; /* limit for inodes warnings */ + xfs_qwarncnt_t qi_rtbwarnlimit;/* limit for rt blks warnings */ + struct mutex qi_quotaofflock;/* to serialize quotaoff */ + xfs_filblks_t qi_dqchunklen; /* # BBs in a chunk of dqs */ + uint qi_dqperchunk; /* # ondisk dq in above chunk */ struct xfs_def_quota qi_usr_default; struct xfs_def_quota qi_grp_default; struct xfs_def_quota qi_prj_default; - struct shrinker qi_shrinker; + struct shrinker qi_shrinker; }; static inline struct radix_tree_root * diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c index 38669e827206..cb16a91dd1d4 100644 --- a/fs/xfs/xfs_quotaops.c +++ b/fs/xfs/xfs_quotaops.c @@ -23,8 +23,8 @@ xfs_qm_fill_state( struct xfs_inode *ip, xfs_ino_t ino) { - struct xfs_quotainfo *q = mp->m_quotainfo; - bool tempqip = false; + struct xfs_quotainfo *q = mp->m_quotainfo; + bool tempqip = false; tstate->ino = ino; if (!ip && ino == NULLFSINO) @@ -109,8 +109,8 @@ xfs_fs_set_info( int type, struct qc_info *info) { - struct xfs_mount *mp = XFS_M(sb); - struct qc_dqblk newlim; + struct xfs_mount *mp = XFS_M(sb); + struct qc_dqblk newlim; if (sb_rdonly(sb)) return -EROFS;