Merge tag 'dlm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[linux-block.git] / fs / ocfs2 / dlmglue.c

diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index c3e2961ee5db3cd9331a638d622061a8d97594d1..64a6ef638495c28aabaacdde2c5f0a882769bc8f 100644 (file)
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2162,7 +2162,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 timespec64 ctime = inode_get_ctime(inode);
+       struct timespec64 ts;
 
        lvb = ocfs2_dlm_lvb(&lockres->l_lksb);
 
@@ -2183,12 +2183,12 @@ 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);
-       lvb->lvb_iatime_packed  =
-               cpu_to_be64(ocfs2_pack_timespec(&inode->i_atime));
-       lvb->lvb_ictime_packed =
-               cpu_to_be64(ocfs2_pack_timespec(&ctime));
-       lvb->lvb_imtime_packed =
-               cpu_to_be64(ocfs2_pack_timespec(&inode->i_mtime));
+       ts = inode_get_atime(inode);
+       lvb->lvb_iatime_packed = cpu_to_be64(ocfs2_pack_timespec(&ts));
+       ts = inode_get_ctime(inode);
+       lvb->lvb_ictime_packed = cpu_to_be64(ocfs2_pack_timespec(&ts));
+       ts = inode_get_mtime(inode);
+       lvb->lvb_imtime_packed = 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);
@@ -2209,7 +2209,7 @@ static int ocfs2_refresh_inode_from_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 timespec64 ctime;
+       struct timespec64 ts;
 
        mlog_meta_lvb(0, lockres);
 
@@ -2236,13 +2236,12 @@ static int 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,
-                             be64_to_cpu(lvb->lvb_iatime_packed));
-       ocfs2_unpack_timespec(&inode->i_mtime,
-                             be64_to_cpu(lvb->lvb_imtime_packed));
-       ocfs2_unpack_timespec(&ctime,
-                             be64_to_cpu(lvb->lvb_ictime_packed));
-       inode_set_ctime_to_ts(inode, ctime);
+       ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_iatime_packed));
+       inode_set_atime_to_ts(inode, ts);
+       ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_imtime_packed));
+       inode_set_mtime_to_ts(inode, ts);
+       ocfs2_unpack_timespec(&ts, be64_to_cpu(lvb->lvb_ictime_packed));
+       inode_set_ctime_to_ts(inode, ts);
        spin_unlock(&oi->ip_lock);
        return 0;
 }