diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 13:53:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 13:53:23 -0700 |
| commit | 76d5b28bbad1c5502a24f94c2beafc468690b2ba (patch) | |
| tree | aa98fcfd4ca8835216fa8de6064f7cced35082f0 /include | |
| parent | 71e9dcc0019c8b1e7395d2d1512c08aa1c828710 (diff) | |
| parent | e008bb6134a6e68fd2c827a46b27d017d920de8f (diff) | |
| download | linux-76d5b28bbad1c5502a24f94c2beafc468690b2ba.tar.bz2 | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota update from Jan Kara:
"time64 support for quota"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: use time64_t internally
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/quota.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/quota.h b/include/linux/quota.h index 9dfb6bce8c9e..8486d27cf360 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -200,8 +200,8 @@ struct mem_dqblk { qsize_t dqb_ihardlimit; /* absolute limit on allocated inodes */ qsize_t dqb_isoftlimit; /* preferred inode limit */ qsize_t dqb_curinodes; /* current # allocated inodes */ - time_t dqb_btime; /* time limit for excessive disk use */ - time_t dqb_itime; /* time limit for excessive inode use */ + time64_t dqb_btime; /* time limit for excessive disk use */ + time64_t dqb_itime; /* time limit for excessive inode use */ }; /* |