1 files changed, 14 insertions, 6 deletions

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 68728de12864..0ff424c6d17c 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2140,6 +2140,7 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
         struct ocfs2_inode_info *oi = OCFS2_I(inode);
         struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;
         struct ocfs2_meta_lvb *lvb;
+        struct timespec ts;
 
         lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
 
@@ -2160,12 +2161,15 @@ static void __ocfs2_stuff_meta_lvb(struct inode *inode)
         lvb->lvb_igid      = cpu_to_be32(i_gid_read(inode));
         lvb->lvb_imode     = cpu_to_be16(inode->i_mode);
         lvb->lvb_inlink    = cpu_to_be16(inode->i_nlink);
+        ts = timespec64_to_timespec(inode->i_atime);
         lvb->lvb_iatime_packed  =
-                cpu_to_be64(ocfs2_pack_timespec(&inode->i_atime));
+                cpu_to_be64(ocfs2_pack_timespec(&ts));
+        ts = timespec64_to_timespec(inode->i_ctime);
         lvb->lvb_ictime_packed =
-                cpu_to_be64(ocfs2_pack_timespec(&inode->i_ctime));
+                cpu_to_be64(ocfs2_pack_timespec(&ts));
+        ts = timespec64_to_timespec(inode->i_mtime);
         lvb->lvb_imtime_packed =
-                cpu_to_be64(ocfs2_pack_timespec(&inode->i_mtime));
+                cpu_to_be64(ocfs2_pack_timespec(&ts));
         lvb->lvb_iattr    = cpu_to_be32(oi->ip_attr);
         lvb->lvb_idynfeatures = cpu_to_be16(oi->ip_dyn_features);
         lvb->lvb_igeneration = cpu_to_be32(inode->i_generation);
@@ -2183,6 +2187,7 @@ static void ocfs2_unpack_timespec(struct timespec *spec,
 
 static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
 {
+        struct timespec ts;
         struct ocfs2_inode_info *oi = OCFS2_I(inode);
         struct ocfs2_lock_res *lockres = &oi->ip_inode_lockres;
         struct ocfs2_meta_lvb *lvb;
@@ -2210,12 +2215,15 @@ static void ocfs2_refresh_inode_from_lvb(struct inode *inode)
         i_gid_write(inode, be32_to_cpu(lvb->lvb_igid));
         inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
         set_nlink(inode, be16_to_cpu(lvb->lvb_inlink));
-        ocfs2_unpack_timespec(&inode->i_atime,
+        ocfs2_unpack_timespec(&ts,
                               be64_to_cpu(lvb->lvb_iatime_packed));
-        ocfs2_unpack_timespec(&inode->i_mtime,
+        inode->i_atime = timespec_to_timespec64(ts);
+        ocfs2_unpack_timespec(&ts,
                               be64_to_cpu(lvb->lvb_imtime_packed));
-        ocfs2_unpack_timespec(&inode->i_ctime,
+        inode->i_mtime = timespec_to_timespec64(ts);
+        ocfs2_unpack_timespec(&ts,
                               be64_to_cpu(lvb->lvb_ictime_packed));
+        inode->i_ctime = timespec_to_timespec64(ts);
         spin_unlock(&oi->ip_lock);
 }