Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/debugfs' and 'asoc...

[mirror_ubuntu-bionic-kernel.git] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 4032d1e87c8fabc0db9dd327ebc3c4c748e53541..0037aea97d39a6c73eff9755d805bc2312b552a3 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/string.h>
 #include <linux/pagemap.h>
+#include <linux/bio.h>
 #include "reiserfs.h"
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>
@@ -1987,8 +1988,8 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
                        pathrelse(&s_search_path);
 
                        if (update_timestamps) {
-                               inode->i_mtime = CURRENT_TIME_SEC;
-                               inode->i_ctime = CURRENT_TIME_SEC;
+                               inode->i_mtime = current_time(inode);
+                               inode->i_ctime = current_time(inode);
                        }
                        reiserfs_update_sd(th, inode);
 
@@ -2012,8 +2013,8 @@ int reiserfs_do_truncate(struct reiserfs_transaction_handle *th,
 update_and_out:
        if (update_timestamps) {
                /* this is truncate, not file closing */
-               inode->i_mtime = CURRENT_TIME_SEC;
-               inode->i_ctime = CURRENT_TIME_SEC;
+               inode->i_mtime = current_time(inode);
+               inode->i_ctime = current_time(inode);
        }
        reiserfs_update_sd(th, inode);