From d38f98b6c2659602117229f6b3b439319c092aac Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Thu, 22 Sep 2016 08:49:57 +0200 Subject: [PATCH] quotactl.2: ffix Signed-off-by: Michael Kerrisk --- man2/quotactl.2 | 187 ++++++++++++++++++++++++------------------------ 1 file changed, 95 insertions(+), 92 deletions(-) diff --git a/man2/quotactl.2 b/man2/quotactl.2 index 280e39c70..13347375c 100644 --- a/man2/quotactl.2 +++ b/man2/quotactl.2 @@ -147,24 +147,24 @@ as follows: /* uint64_t is an unsigned 64\-bit integer; uint32_t is an unsigned 32\-bit integer */ -struct dqblk { /* Definition since Linux 2.4.22 */ - uint64_t dqb_bhardlimit; /* absolute limit on disk - quota blocks alloc */ - uint64_t dqb_bsoftlimit; /* preferred limit on - disk quota blocks */ - uint64_t dqb_curspace; /* current occupied space - (in bytes) */ - uint64_t dqb_ihardlimit; /* maximum number of - allocated inodes */ - uint64_t dqb_isoftlimit; /* preferred inode limit */ - uint64_t dqb_curinodes; /* current number of - allocated inodes */ - uint64_t dqb_btime; /* time limit for excessive - disk use */ - uint64_t dqb_itime; /* time limit for excessive - files */ - uint32_t dqb_valid; /* bit mask of QIF_* - constants */ +struct dqblk { /* Definition since Linux 2.4.22 */ + uint64_t dqb_bhardlimit; /* Absolute limit on disk + quota blocks alloc */ + uint64_t dqb_bsoftlimit; /* Preferred limit on + disk quota blocks */ + uint64_t dqb_curspace; /* Current occupied space + (in bytes) */ + uint64_t dqb_ihardlimit; /* Maximum number of + allocated inodes */ + uint64_t dqb_isoftlimit; /* Preferred inode limit */ + uint64_t dqb_curinodes; /* Current number of + allocated inodes */ + uint64_t dqb_btime; /* Time limit for excessive + disk use */ + uint64_t dqb_itime; /* Time limit for excessive + files */ + uint32_t dqb_valid; /* Bit mask of QIF_* + constants */ }; /* Flags in dqb_valid that indicate which fields in @@ -271,13 +271,12 @@ as follows: uint32_t is an unsigned 32\-bit integer */ struct dqinfo { /* Defined since kernel 2.4.22 */ - uint64_t dqi_bgrace; /* Time before block soft limit - becomes hard limit */ - - uint64_t dqi_igrace; /* Time before inode soft limit - becomes hard limit */ - uint32_t dqi_flags; /* Flags for quotafile - (DQF_*) */ + uint64_t dqi_bgrace; /* Time before block soft limit + becomes hard limit */ + uint64_t dqi_igrace; /* Time before inode soft limit + becomes hard limit */ + uint32_t dqi_flags; /* Flags for quotafile + (DQF_*) */ uint32_t dqi_valid; }; @@ -285,9 +284,9 @@ struct dqinfo { /* Defined since kernel 2.4.22 */ /* Quota format QFMT_VFS_OLD */ -#define DQF_ROOT_SQUASH (1 << 0) /* Root squash enabled */ - /* Before Linux v4.0, this had been defined - privately as V1_DQF_RSQUASH */ +#define DQF_ROOT_SQUASH (1 << 0) /* Root squash enabled */ + /* Before Linux v4.0, this had been defined + privately as V1_DQF_RSQUASH */ /* Quota format QFMT_VFS_V0 / QFMT_VFS_V1 */ @@ -297,10 +296,10 @@ struct dqinfo { /* Defined since kernel 2.4.22 */ /* Flags in dqi_valid that indicate which fields in dqinfo structure are valid. */ -# define IIF_BGRACE 1 -# define IIF_IGRACE 2 -# define IIF_FLAGS 4 -# define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) +#define IIF_BGRACE 1 +#define IIF_IGRACE 2 +#define IIF_FLAGS 4 +#define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) .fi .in @@ -396,10 +395,12 @@ that contains a combination of the following flags (defined in .nf .in +4n -#define XFS_QUOTA_UDQ_ACCT (1<<0) /* User quota accounting */ +#define XFS_QUOTA_UDQ_ACCT (1<<0) /* User quota + accounting */ #define XFS_QUOTA_UDQ_ENFD (1<<1) /* User quota limits enforcement */ -#define XFS_QUOTA_GDQ_ACCT (1<<2) /* Group quota accounting */ +#define XFS_QUOTA_GDQ_ACCT (1<<2) /* Group quota + accounting */ #define XFS_QUOTA_GDQ_ENFD (1<<3) /* Group quota limits enforcement */ #define XFS_QUOTA_PDQ_ACCT (1<<4) /* Project quota @@ -447,17 +448,17 @@ as follows: /* All the blk units are in BBs (Basic Blocks) of 512 bytes. */ -#define FS_DQUOT_VERSION 1 /* fs_disk_quota.d_version */ +#define FS_DQUOT_VERSION 1 /* fs_disk_quota.d_version */ -#define XFS_USER_QUOTA (1<<0) /* User quota type */ -#define XFS_PROJ_QUOTA (1<<1) /* Project quota type */ -#define XFS_GROUP_QUOTA (1<<2) /* Group quota type */ +#define XFS_USER_QUOTA (1<<0) /* User quota type */ +#define XFS_PROJ_QUOTA (1<<1) /* Project quota type */ +#define XFS_GROUP_QUOTA (1<<2) /* Group quota type */ struct fs_disk_quota { - int8_t d_version; /* Version of this structure */ - int8_t d_flags; /* XFS_{USER,PROJ,GROUP}_QUOTA */ - uint16_t d_fieldmask; /* Field specifier */ - uint32_t d_id; /* User, project, or group ID */ + int8_t d_version; /* Version of this structure */ + int8_t d_flags; /* XFS_{USER,PROJ,GROUP}_QUOTA */ + uint16_t d_fieldmask; /* Field specifier */ + uint32_t d_id; /* User, project, or group ID */ uint64_t d_blk_hardlimit; /* Absolute limit on disk blocks */ uint64_t d_blk_softlimit; /* Preferred limit on @@ -465,29 +466,29 @@ struct fs_disk_quota { uint64_t d_ino_hardlimit; /* Maximum # allocated inodes */ uint64_t d_ino_softlimit; /* Preferred inode limit */ - uint64_t d_bcount; /* # disk blocks owned by - the user */ - uint64_t d_icount; /* # inodes owned by the user */ - int32_t d_itimer; /* Zero if within inode limits */ - /* If not, we refuse service */ - int32_t d_btimer; /* Similar to above; for - disk blocks */ - uint16_t d_iwarns; /* # warnings issued with - respect to # of inodes */ - uint16_t d_bwarns; /* # warnings issued with - respect to disk blocks */ - int32_t d_padding2; /* Padding - for future use */ + uint64_t d_bcount; /* # disk blocks owned by + the user */ + uint64_t d_icount; /* # inodes owned by the user */ + int32_t d_itimer; /* Zero if within inode limits */ + /* If not, we refuse service */ + int32_t d_btimer; /* Similar to above; for + disk blocks */ + uint16_t d_iwarns; /* # warnings issued with + respect to # of inodes */ + uint16_t d_bwarns; /* # warnings issued with + respect to disk blocks */ + int32_t d_padding2; /* Padding - for future use */ uint64_t d_rtb_hardlimit; /* Absolute limit on realtime (RT) disk blocks */ uint64_t d_rtb_softlimit; /* Preferred limit on RT disk blocks */ - uint64_t d_rtbcount; /* # realtime blocks owned */ - int32_t d_rtbtimer; /* Similar to above; for RT - disk blocks */ - uint16_t d_rtbwarns; /* # warnings issued with - respect to RT disk blocks */ - int16_t d_padding3; /* Padding - for future use */ - char d_padding4[8];/* Yet more padding */ + uint64_t d_rtbcount; /* # realtime blocks owned */ + int32_t d_rtbtimer; /* Similar to above; for RT + disk blocks */ + uint16_t d_rtbwarns; /* # warnings issued with + respect to RT disk blocks */ + int16_t d_padding3; /* Padding - for future use */ + char d_padding4[8]; /* Yet more padding */ }; .in .fi @@ -554,20 +555,21 @@ struct fs_qfilestat { }; struct fs_quota_stat { - int8_t qs_version; /* Version number for - future changes */ - uint16_t qs_flags; /* XFS_QUOTA_{U,P,G}DQ_{ACCT,ENFD} */ - int8_t qs_pad; /* Unused */ - struct fs_qfilestat qs_uquota; /* User quota storage - information */ - struct fs_qfilestat qs_gquota; /* Group quota storage - information */ - uint32_t qs_incoredqs; /* Number of dquots in core */ - int32_t qs_btimelimit; /* Limit for blocks timer */ - int32_t qs_itimelimit; /* Limit for inodes timer */ - int32_t qs_rtbtimelimit; /* Limit for RT blocks timer */ - uint16_t qs_bwarnlimit; /* Limit for # of warnings */ - uint16_t qs_iwarnlimit; /* Limit for # of warnings */ + int8_t qs_version; /* Version number for + future changes */ + uint16_t qs_flags; /* XFS_QUOTA_{U,P,G}DQ_{ACCT,ENFD} */ + int8_t qs_pad; /* Unused */ + struct fs_qfilestat qs_uquota; /* User quota storage + information */ + struct fs_qfilestat qs_gquota; /* Group quota storage + information */ + uint32_t qs_incoredqs; /* Number of dquots in core */ + int32_t qs_btimelimit; /* Limit for blocks timer */ + int32_t qs_itimelimit; /* Limit for inodes timer */ + int32_t qs_rtbtimelimit;/* Limit for RT + blocks timer */ + uint16_t qs_bwarnlimit; /* Limit for # of warnings */ + uint16_t qs_iwarnlimit; /* Limit for # of warnings */ }; .in .fi @@ -596,28 +598,29 @@ structure itself is defined as follows: #define FS_QSTATV_VERSION1 1 /* fs_quota_statv.qs_version */ struct fs_qfilestatv { - uint64_t qfs_ino; /* Inode number */ - uint64_t qfs_nblks; /* Number of BBs - 512-byte-blocks */ - uint32_t qfs_nextents; /* Number of extents */ - uint32_t qfs_pad; /* Pad for 8-byte alignment */ + uint64_t qfs_ino; /* Inode number */ + uint64_t qfs_nblks; /* Number of BBs + 512-byte-blocks */ + uint32_t qfs_nextents; /* Number of extents */ + uint32_t qfs_pad; /* Pad for 8-byte alignment */ }; struct fs_quota_statv { - int8_t qs_version; /* Version for future - changes */ - uint8_t qs_pad1; /* Pad for 16-bit alignment */ - uint16_t qs_flags; /* XFS_QUOTA_.* flags */ - uint32_t qs_incoredqs; /* Number of dquots incore */ - struct fs_qfilestatv qs_uquota; /* User quota - information */ - struct fs_qfilestatv qs_gquota; /* Group quota - information */ - struct fs_qfilestatv qs_pquota; /* Project quota - information */ + int8_t qs_version; /* Version for future + changes */ + uint8_t qs_pad1; /* Pad for 16-bit alignment */ + uint16_t qs_flags; /* XFS_QUOTA_.* flags */ + uint32_t qs_incoredqs; /* Number of dquots incore */ + struct fs_qfilestatv qs_uquota; /* User quota + information */ + struct fs_qfilestatv qs_gquota; /* Group quota + information */ + struct fs_qfilestatv qs_pquota; /* Project quota + information */ int32_t qs_btimelimit; /* Limit for blocks timer */ int32_t qs_itimelimit; /* Limit for inodes timer */ - int32_t qs_rtbtimelimit; /* Limit for RT blocks timer */ + int32_t qs_rtbtimelimit; /* Limit for RT blocks + timer */ uint16_t qs_bwarnlimit; /* Limit for # of warnings */ uint16_t qs_iwarnlimit; /* Limit for # of warnings */ uint64_t qs_pad2[8]; /* For future proofing */