Merge tag 'ext4_for_linus-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / ext4 / ext4.h

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8ccebe0..f16aa37 100644 (file)
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -891,10 +891,13 @@ do {                                                                              \
                (raw_inode)->xtime = cpu_to_le32(clamp_t(int32_t, (ts).tv_sec, S32_MIN, S32_MAX));      \
 } while (0)
 
-#define EXT4_INODE_SET_XTIME(xtime, inode, raw_inode)                          \
-       EXT4_INODE_SET_XTIME_VAL(xtime, inode, raw_inode, (inode)->xtime)
+#define EXT4_INODE_SET_ATIME(inode, raw_inode)                                         \
+       EXT4_INODE_SET_XTIME_VAL(i_atime, inode, raw_inode, inode_get_atime(inode))
 
-#define EXT4_INODE_SET_CTIME(inode, raw_inode)                                 \
+#define EXT4_INODE_SET_MTIME(inode, raw_inode)                                         \
+       EXT4_INODE_SET_XTIME_VAL(i_mtime, inode, raw_inode, inode_get_mtime(inode))
+
+#define EXT4_INODE_SET_CTIME(inode, raw_inode)                                         \
        EXT4_INODE_SET_XTIME_VAL(i_ctime, inode, raw_inode, inode_get_ctime(inode))
 
 #define EXT4_EINODE_SET_XTIME(xtime, einode, raw_inode)                                \
@@ -910,9 +913,16 @@ do {                                                                               \
                        .tv_sec = (signed)le32_to_cpu((raw_inode)->xtime)       \
                })
 
-#define EXT4_INODE_GET_XTIME(xtime, inode, raw_inode)                          \
+#define EXT4_INODE_GET_ATIME(inode, raw_inode)                                 \
+do {                                                                           \
+       inode_set_atime_to_ts(inode,                                            \
+               EXT4_INODE_GET_XTIME_VAL(i_atime, inode, raw_inode));           \
+} while (0)
+
+#define EXT4_INODE_GET_MTIME(inode, raw_inode)                                 \
 do {                                                                           \
-       (inode)->xtime = EXT4_INODE_GET_XTIME_VAL(xtime, inode, raw_inode);     \
+       inode_set_mtime_to_ts(inode,                                            \
+               EXT4_INODE_GET_XTIME_VAL(i_mtime, inode, raw_inode));           \
 } while (0)
 
 #define EXT4_INODE_GET_CTIME(inode, raw_inode)                                 \
@@ -1538,7 +1548,7 @@ struct ext4_sb_info {
        unsigned long s_commit_interval;
        u32 s_max_batch_time;
        u32 s_min_batch_time;
-       struct block_device *s_journal_bdev;
+       struct bdev_handle *s_journal_bdev_handle;
 #ifdef CONFIG_QUOTA
        /* Names of quota files with journalled quota */
        char __rcu *s_qf_names[EXT4_MAXQUOTAS];