board: i.MX6QDL: add Engicam i.CoreM6 1.5 QDL MIPI starter kit

[u-boot] / fs / ext4 / ext4_journal.h

diff --git a/fs/ext4/ext4_journal.h b/fs/ext4/ext4_journal.h
index d926094becdf5900fdd8ce14e985bdd59ffd408d..3d05ad531546d993cea1da255fd892c48aa192d6 100644 (file)
--- a/fs/ext4/ext4_journal.h
+++ b/fs/ext4/ext4_journal.h
@@ -49,9 +49,9 @@ struct dirty_blocks {
 
 /* Standard header for all descriptor blocks: */
 struct journal_header_t {
-       __u32 h_magic;
-       __u32 h_blocktype;
-       __u32 h_sequence;
+       __be32 h_magic;
+       __be32 h_blocktype;
+       __be32 h_sequence;
 };
 
 /* The journal superblock.  All fields are in big-endian byte order. */
@@ -60,35 +60,35 @@ struct journal_superblock_t {
        struct journal_header_t s_header;
 
        /* Static information describing the journal */
-       __u32 s_blocksize;      /* journal device blocksize */
-       __u32 s_maxlen;         /* total blocks in journal file */
-       __u32 s_first;          /* first block of log information */
+       __be32 s_blocksize;     /* journal device blocksize */
+       __be32 s_maxlen;                /* total blocks in journal file */
+       __be32 s_first;         /* first block of log information */
 
        /* Dynamic information describing the current state of the log */
-       __u32 s_sequence;       /* first commit ID expected in log */
-       __u32 s_start;          /* blocknr of start of log */
+       __be32 s_sequence;      /* first commit ID expected in log */
+       __be32 s_start;         /* blocknr of start of log */
 
        /* Error value, as set by journal_abort(). */
-       __s32 s_errno;
+       __be32 s_errno;
 
        /* Remaining fields are only valid in a version-2 superblock */
-       __u32 s_feature_compat; /* compatible feature set */
-       __u32 s_feature_incompat;       /* incompatible feature set */
-       __u32 s_feature_ro_compat;      /* readonly-compatible feature set */
+       __be32 s_feature_compat;        /* compatible feature set */
+       __be32 s_feature_incompat;      /* incompatible feature set */
+       __be32 s_feature_ro_compat;     /* readonly-compatible feature set */
        /* 0x0030 */
        __u8 s_uuid[16];        /* 128-bit uuid for journal */
 
        /* 0x0040 */
-       __u32 s_nr_users;       /* Nr of filesystems sharing log */
+       __be32 s_nr_users;      /* Nr of filesystems sharing log */
 
-       __u32 s_dynsuper;       /* Blocknr of dynamic superblock copy */
+       __be32 s_dynsuper;      /* Blocknr of dynamic superblock copy */
 
        /* 0x0048 */
-       __u32 s_max_transaction;        /* Limit of journal blocks per trans. */
-       __u32 s_max_trans_data; /* Limit of data blocks per trans. */
+       __be32 s_max_transaction;       /* Limit of journal blocks per trans. */
+       __be32 s_max_trans_data;        /* Limit of data blocks per trans. */
 
        /* 0x0050 */
-       __u32 s_padding[44];
+       __be32 s_padding[44];
 
        /* 0x0100 */
        __u8 s_users[16 * 48];  /* ids of all fs'es sharing the log */
@@ -96,13 +96,13 @@ struct journal_superblock_t {
 } ;
 
 struct ext3_journal_block_tag {
-       uint32_t block;
-       uint32_t flags;
+       __be32 block;
+       __be32 flags;
 };
 
 struct journal_revoke_header_t {
        struct journal_header_t r_header;
-       int r_count;            /* Count of bytes used in the block */
+       __be32 r_count;         /* Count of bytes used in the block */
 };
 
 struct revoke_blk_list {
@@ -115,8 +115,8 @@ extern struct ext2_data *ext4fs_root;
 int ext4fs_init_journal(void);
 int ext4fs_log_gdt(char *gd_table);
 int ext4fs_check_journal_state(int recovery_flag);
-int ext4fs_log_journal(char *journal_buffer, long int blknr);
-int ext4fs_put_metadata(char *metadata_buffer, long int blknr);
+int ext4fs_log_journal(char *journal_buffer, uint32_t blknr);
+int ext4fs_put_metadata(char *metadata_buffer, uint32_t blknr);
 void ext4fs_update_journal(void);
 void ext4fs_dump_metadata(void);
 void ext4fs_push_revoke_blk(char *buffer);