On Fri, Nov 08, 2019 at 10:06:12PM +0100, Pavel Reichl wrote:
> Signed-off-by: Pavel Reichl <preichl@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_trans_resv.c | 4 ++--
> fs/xfs/xfs_dquot_item.h | 14 ++++++++------
> fs/xfs/xfs_qm_syscalls.c | 35 ++++++++++++++++++----------------
> fs/xfs/xfs_trans_dquot.c | 14 +++++++-------
> 4 files changed, 36 insertions(+), 31 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c
> index 271cca13565b..eb7fe42b1d61 100644
> --- a/fs/xfs/libxfs/xfs_trans_resv.c
> +++ b/fs/xfs/libxfs/xfs_trans_resv.c
> @@ -741,7 +741,7 @@ xfs_calc_qm_dqalloc_reservation(
>
> /*
> * Turning off quotas.
> - * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2
> + * sizeof(struct xfs_qoff_logitem) * 2
> * the superblock for the quota flags: sector size
> */
> STATIC uint
> @@ -754,7 +754,7 @@ xfs_calc_qm_quotaoff_reservation(
>
> /*
> * End of turning off quotas.
> - * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2
> + * sizeof(struct xfs_qoff_logitem) * 2
> */
> STATIC uint
> xfs_calc_qm_quotaoff_end_reservation(void)
> diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h
> index e0a24eb7a545..e2348a99fa1a 100644
> --- a/fs/xfs/xfs_dquot_item.h
> +++ b/fs/xfs/xfs_dquot_item.h
> @@ -17,18 +17,20 @@ struct xfs_dq_logitem {
> xfs_lsn_t qli_flush_lsn; /* lsn at last flush */
> };
>
> -typedef struct xfs_qoff_logitem {
> +struct xfs_qoff_logitem {
> struct xfs_log_item qql_item; /* common portion */
> struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */
> unsigned int qql_flags;
> -} xfs_qoff_logitem_t;
> +};
>
>
> extern void xfs_qm_dquot_logitem_init(struct xfs_dquot *);
> -extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init(struct xfs_mount *,
> - struct xfs_qoff_logitem *, uint);
> -extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item(struct xfs_trans *,
> - struct xfs_qoff_logitem *, uint);
> +extern struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init(struct xfs_mount *mp,
> + struct xfs_qoff_logitem *start,
> + uint flags);
> +extern struct xfs_qoff_logitem *xfs_trans_get_qoff_item(struct xfs_trans *tp,
> + struct xfs_qoff_logitem *startqoff,
> + uint flags);
Kill the 'extern's, and only indent the second and third lines twice:
struct xfs_qoff_logitem *xfs_trans_get_qoff_item(struct xfs_trans *tp,
struct xfs_qoff_logitem *startqoff, uint flags);
(Here and everywhere else...)
((Others will have different opinions about indentation but I'm lazy and
only bother doing two indents, like a lot of code in XFS.))
(((I personally dislike the kernel indent style because I don't want to
spend brainpower making all the spaces line up just exactly; I'd rather
just put in my two tabs with muscle memory and concentrate on getting
the code to work properly.)))
> extern void xfs_trans_log_quotaoff_item(struct xfs_trans *,
> struct xfs_qoff_logitem *);
>
> diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
> index da7ad0383037..52909cb00249 100644
> --- a/fs/xfs/xfs_qm_syscalls.c
> +++ b/fs/xfs/xfs_qm_syscalls.c
> @@ -19,9 +19,12 @@
> #include "xfs_qm.h"
> #include "xfs_icache.h"
>
> -STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint);
> -STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *,
> - uint);
> +STATIC int xfs_qm_log_quotaoff(struct xfs_mount *mp,
> + struct xfs_qoff_logitem **qoffstartp,
> + uint flags);
> +STATIC int xfs_qm_log_quotaoff_end(struct xfs_mount *mp,
> + struct xfs_qoff_logitem *startqoff,
> + uint flags);
>
> /*
> * Turn off quota accounting and/or enforcement for all udquots and/or
> @@ -40,7 +43,7 @@ xfs_qm_scall_quotaoff(
> uint dqtype;
> int error;
> uint inactivate_flags;
> - xfs_qoff_logitem_t *qoffstart;
> + struct xfs_qoff_logitem *qoffstart;
>
> /*
> * No file system can have quotas enabled on disk but not in core.
> @@ -540,13 +543,13 @@ xfs_qm_scall_setqlim(
>
> STATIC int
> xfs_qm_log_quotaoff_end(
> - xfs_mount_t *mp,
> - xfs_qoff_logitem_t *startqoff,
> - uint flags)
> + struct xfs_mount *mp,
> + struct xfs_qoff_logitem *startqoff,
> + uint flags)
> {
> - xfs_trans_t *tp;
> - int error;
> - xfs_qoff_logitem_t *qoffi;
> + struct xfs_trans *tp;
> + int error;
You don't need the extra space before 'error'. The '*' is as much a
part of the parameter as the name.
> + struct xfs_qoff_logitem *qoffi;
>
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp);
> if (error)
> @@ -568,13 +571,13 @@ xfs_qm_log_quotaoff_end(
>
> STATIC int
> xfs_qm_log_quotaoff(
> - xfs_mount_t *mp,
> - xfs_qoff_logitem_t **qoffstartp,
> - uint flags)
> + struct xfs_mount *mp,
> + struct xfs_qoff_logitem **qoffstartp,
> + uint flags)
> {
> - xfs_trans_t *tp;
> - int error;
> - xfs_qoff_logitem_t *qoffi;
> + struct xfs_trans *tp;
> + int error;
> + struct xfs_qoff_logitem *qoffi;
>
> *qoffstartp = NULL;
>
> diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
> index 4789f7e11f53..0c4638c74f44 100644
> --- a/fs/xfs/xfs_trans_dquot.c
> +++ b/fs/xfs/xfs_trans_dquot.c
> @@ -824,13 +824,13 @@ xfs_trans_reserve_quota_nblks(
> /*
> * This routine is called to allocate a quotaoff log item.
> */
> -xfs_qoff_logitem_t *
> +struct xfs_qoff_logitem *
> xfs_trans_get_qoff_item(
> - xfs_trans_t *tp,
> - xfs_qoff_logitem_t *startqoff,
> - uint flags)
> + struct xfs_trans *tp,
Er, please make these line up.
--D
> + struct xfs_qoff_logitem *startqoff,
> + uint flags)
> {
> - xfs_qoff_logitem_t *q;
> + struct xfs_qoff_logitem *q;
>
> ASSERT(tp != NULL);
>
> @@ -852,8 +852,8 @@ xfs_trans_get_qoff_item(
> */
> void
> xfs_trans_log_quotaoff_item(
> - xfs_trans_t *tp,
> - xfs_qoff_logitem_t *qlp)
> + struct xfs_trans *tp,
> + struct xfs_qoff_logitem *qlp)
> {
> tp->t_flags |= XFS_TRANS_DIRTY;
> set_bit(XFS_LI_DIRTY, &qlp->qql_item.li_flags);
> --
> 2.23.0
>
