diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 22:47:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-15 22:47:23 -0700 |
| commit | 5bae2be4efd557ba3ec18f125d18c546f6b03cd2 (patch) | |
| tree | 5ef69f3db0bf2c1987b60e356f7748849c75eef7 | |
| parent | 2b2f2aedba985108cbc92a761ac0d9fc4c774616 (diff) | |
| parent | bd646104ac5a6bf8bdddaeaf4e441f5d439ded96 (diff) | |
Merge tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy
Pull jfs update from David Kleikamp:
"Just one jfs patch for 4.19"
* tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy:
jfs: use time64_t for otime
| -rw-r--r-- | fs/jfs/jfs_incore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h index 9940a1e04cbf..912a3af2393e 100644 --- a/fs/jfs/jfs_incore.h +++ b/fs/jfs/jfs_incore.h @@ -43,7 +43,7 @@ struct jfs_inode_info { pxd_t ixpxd; /* inode extent descriptor */ dxd_t acl; /* dxd describing acl */ dxd_t ea; /* dxd describing ea */ - time_t otime; /* time created */ + time64_t otime; /* time created */ uint next_index; /* next available directory entry index */ int acltype; /* Type of ACL */ short btorder; /* access order */ |