Pull quota interface unification and misc cleanups from Jan Kara: "The first part of the series unifying XFS and VFS quota interfaces. This part unifies turning quotas on and off so quota-tools and xfs_quota can be used to manage any filesystem. This is useful so that userspace doesn't have to distinguish which filesystem it is working with. As a result we can then easily reuse tests for project quotas in XFS for ext4. This also contains minor cleanups and fixes for udf, isofs, and ext3" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: (23 commits) udf: remove bool assignment to 0/1 udf: use bool for done quota: Store maximum space limit in bytes quota: Remove quota_on_meta callback ocfs2: Use generic helpers for quotaon and quotaoff ext4: Use generic helpers for quotaon and quotaoff quota: Add ->quota_{enable,disable} callbacks for VFS quotas quota: Wire up ->quota_{enable,disable} callbacks into Q_QUOTA{ON,OFF} quota: Split ->set_xstate callback into two xfs: Remove some pointless quota checks xfs: Remove some useless flags tests xfs: Remove useless test quota: Verify flags passed to Q_SETINFO quota: Cleanup flags definitions ocfs2: Move OLQF_CLEAN flag out of generic quota flags quota: Don't store flags for v2 quota format jbd: drop jbd_ENOSYS debug udf: destroy sbi mutex in put_super udf: Check length of extended attributes and allocation descriptors udf: Remove repeated loads blocksize ...
Showing the changes to include/uapi/linux (1 of 21 files). Show all
Unified · Split
| @@ -126,10 +126,22 @@ struct if_dqblk { · 125 unmodified lines | |||
| 126 | #define IIF_FLAGS 4 | 126 | #define IIF_FLAGS 4 |
| 127 | #define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) | 127 | #define IIF_ALL (IIF_BGRACE | IIF_IGRACE | IIF_FLAGS) |
| 128 | 128 | ||
| 129 | enum { | ||
| 130 | DQF_ROOT_SQUASH_B = 0, | ||
| 131 | DQF_SYS_FILE_B = 16, | ||
| 132 | /* Kernel internal flags invisible to userspace */ | ||
| 133 | DQF_PRIVATE | ||
| 134 | }; | ||
| 135 | |||
| 136 | /* Root squash enabled (for v1 quota format) */ | ||
| 137 | #define DQF_ROOT_SQUASH (1 << DQF_ROOT_SQUASH_B) | ||
| 138 | /* Quota stored in a system file */ | ||
| 139 | #define DQF_SYS_FILE (1 << DQF_SYS_FILE_B) | ||
| 140 | |||
| 129 | struct if_dqinfo { | 141 | struct if_dqinfo { |
| 130 | __u64 dqi_bgrace; | 142 | __u64 dqi_bgrace; |
| 131 | __u64 dqi_igrace; | 143 | __u64 dqi_igrace; |
| 132 | __u32 dqi_flags; | 144 | __u32 dqi_flags; /* DFQ_* */ |
| 133 | __u32 dqi_valid; | 145 | __u32 dqi_valid; |
| 134 | }; | 146 | }; |
| 135 | 147 | ||