diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-24 12:12:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-24 12:12:40 -0800 |
| commit | d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5 (patch) | |
| tree | 4ba57a6ec31f3a4683e7766fbf4f182d459a8b51 /include | |
| parent | 4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518 (diff) | |
| parent | 46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af (diff) | |
| download | linux-3.10-d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5.tar.gz linux-3.10-d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5.tar.bz2 linux-3.10-d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: Pass information that quota is stored in system file to userspace
ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls
jbd: Issue cache flush after checkpointing
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/quota.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/quota.h b/include/linux/quota.h index cb785569903..c09fa042b5e 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -230,7 +230,11 @@ struct mem_dqinfo { struct super_block; #define DQF_MASK 0xffff /* Mask for format specific flags */ -#define DQF_INFO_DIRTY_B 16 +#define DQF_GETINFO_MASK 0x1ffff /* Mask for flags passed to userspace */ +#define DQF_SETINFO_MASK 0xffff /* Mask for flags modifiable from userspace */ +#define DQF_SYS_FILE_B 16 +#define DQF_SYS_FILE (1 << DQF_SYS_FILE_B) /* Quota file stored as system file */ +#define DQF_INFO_DIRTY_B 31 #define DQF_INFO_DIRTY (1 << DQF_INFO_DIRTY_B) /* Is info dirty? */ extern void mark_info_dirty(struct super_block *sb, int type); |