diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 20:53:23 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-28 20:53:23 (GMT) |
| commit | 76d5b28bbad1c5502a24f94c2beafc468690b2ba (patch) | |
| tree | aa98fcfd4ca8835216fa8de6064f7cced35082f0 /fs/ocfs2 | |
| parent | 71e9dcc0019c8b1e7395d2d1512c08aa1c828710 (diff) | |
| parent | e008bb6134a6e68fd2c827a46b27d017d920de8f (diff) | |
| download | linux-76d5b28bbad1c5502a24f94c2beafc468690b2ba.tar.xz | |
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 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/quota_global.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c index ab6a6cd..87e577a 100644 --- a/fs/ocfs2/quota_global.c +++ b/fs/ocfs2/quota_global.c @@ -483,7 +483,7 @@ int __ocfs2_sync_dquot(struct dquot *dquot, int freeing) struct ocfs2_mem_dqinfo *info = sb_dqinfo(sb, type)->dqi_priv; struct ocfs2_global_disk_dqblk dqblk; s64 spacechange, inodechange; - time_t olditime, oldbtime; + time64_t olditime, oldbtime; err = sb->s_op->quota_read(sb, type, (char *)&dqblk, sizeof(struct ocfs2_global_disk_dqblk), |