diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 17:04:52 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 17:04:51 -0800 |
| commit | ef9871c7087e0b0e91ca7eff0908cebc148177e7 (patch) | |
| tree | 7e0384f6674a09ffb8b3cc897e12b8cb70531c42 /fs/jbd2/commit.c | |
| parent | 5c097356593addad1a7830943de79e21a3eb5dd2 (diff) | |
| parent | efbe378b81e36d9ab6d3a2b3e0e2c3834c6a6528 (diff) | |
Merge "Merge branch 'v4.4-16.09-android-tmp' into lsk-v4.4-16.09-android"
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 36345fefa3ff..2d964ce45606 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -124,7 +124,7 @@ static int journal_submit_commit_record(journal_t *journal, struct commit_header *tmp; struct buffer_head *bh; int ret; - struct timespec now = current_kernel_time(); + struct timespec64 now = current_kernel_time64(); *cbh = NULL; |