Commit 5bae2be4 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 2b2f2aed bd646104
...@@ -43,7 +43,7 @@ struct jfs_inode_info { ...@@ -43,7 +43,7 @@ struct jfs_inode_info {
pxd_t ixpxd; /* inode extent descriptor */ pxd_t ixpxd; /* inode extent descriptor */
dxd_t acl; /* dxd describing acl */ dxd_t acl; /* dxd describing acl */
dxd_t ea; /* dxd describing ea */ dxd_t ea; /* dxd describing ea */
time_t otime; /* time created */ time64_t otime; /* time created */
uint next_index; /* next available directory entry index */ uint next_index; /* next available directory entry index */
int acltype; /* Type of ACL */ int acltype; /* Type of ACL */
short btorder; /* access order */ short btorder; /* access order */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment