Update from 2013.01 to 2013.07

[karo-tx-uboot.git] / fs / ext4 / ext4_journal.c

diff --git a/fs/ext4/ext4_journal.c b/fs/ext4/ext4_journal.c
index 9f017084f17e37c1949947f557861d4f7b2c02ec..d4a46ed8b65f1565c83a5f3ab20af1b2719f3bc0 100644 (file)
--- a/fs/ext4/ext4_journal.c
+++ b/fs/ext4/ext4_journal.c
@@ -10,23 +10,7 @@
  * Written by Stephen C. Tweedie <sct@redhat.com>
  *
  * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved
- * This file is part of the Linux kernel and is made available under
- * the terms of the GNU General Public License, version 2, or at your
- * option, any later version, incorporated herein by reference.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -37,7 +21,7 @@
 
 static struct revoke_blk_list *revk_blk_list;
 static struct revoke_blk_list *prev_node;
-static int first_node = TRUE;
+static int first_node = true;
 
 int gindex;
 int gd_index;
@@ -268,10 +252,10 @@ void ext4fs_push_revoke_blk(char *buffer)
                return;
        memcpy(node->content, buffer, fs->blksz);
 
-       if (first_node == TRUE) {
+       if (first_node == true) {
                revk_blk_list = node;
                prev_node = node;
-                first_node = FALSE;
+                first_node = false;
        } else {
                prev_node->next = node;
                prev_node = node;
@@ -298,7 +282,7 @@ void ext4fs_free_revoke_blks(void)
 
        revk_blk_list = NULL;
        prev_node = NULL;
-       first_node = TRUE;
+       first_node = true;
 }
 
 int check_blknr_for_revoke(long int blknr, int sequence_no)
@@ -360,7 +344,8 @@ void recover_transaction(int prev_desc_logical_no)
                          (struct ext2_inode *)&inode_journal);
        blknr = read_allocated_block((struct ext2_inode *)
                                     &inode_journal, i);
-       ext4fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, temp_buff);
+       ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, fs->blksz,
+                      temp_buff);
        p_jdb = (char *)temp_buff;
        jdb = (struct journal_header_t *) temp_buff;
        ofs = sizeof(struct journal_header_t);
@@ -384,7 +369,7 @@ void recover_transaction(int prev_desc_logical_no)
                                continue;
                }
                blknr = read_allocated_block(&inode_journal, i);
-               ext4fs_devread(blknr * fs->sect_perblk, 0,
+               ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0,
                               fs->blksz, metadata_buff);
                put_ext4((uint64_t)(be32_to_cpu(tag->block) * fs->blksz),
                         metadata_buff, (uint32_t) fs->blksz);
@@ -431,7 +416,8 @@ int ext4fs_check_journal_state(int recovery_flag)
 
        ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal);
        blknr = read_allocated_block(&inode_journal, EXT2_JOURNAL_SUPERBLOCK);
-       ext4fs_devread(blknr * fs->sect_perblk, 0, fs->blksz, temp_buff);
+       ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, fs->blksz,
+                      temp_buff);
        jsb = (struct journal_superblock_t *) temp_buff;
 
        if (fs->sb->feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) {
@@ -455,7 +441,7 @@ int ext4fs_check_journal_state(int recovery_flag)
        while (1) {
                blknr = read_allocated_block(&inode_journal, i);
                memset(temp_buff1, '\0', fs->blksz);
-               ext4fs_devread(blknr * fs->sect_perblk,
+               ext4fs_devread((lbaint_t)blknr * fs->sect_perblk,
                               0, fs->blksz, temp_buff1);
                jdb = (struct journal_header_t *) temp_buff1;
 
@@ -534,16 +520,14 @@ end:
                jsb->s_start = cpu_to_be32(1);
                jsb->s_sequence = cpu_to_be32(be32_to_cpu(jsb->s_sequence) + 1);
                /* get the superblock */
-               ext4fs_devread(SUPERBLOCK_SECTOR, 0, SUPERBLOCK_SIZE,
-                              (char *)fs->sb);
+               ext4_read_superblock((char *)fs->sb);
                fs->sb->feature_incompat |= EXT3_FEATURE_INCOMPAT_RECOVER;
 
                /* Update the super block */
                put_ext4((uint64_t) (SUPERBLOCK_SIZE),
                         (struct ext2_sblock *)fs->sb,
                         (uint32_t) SUPERBLOCK_SIZE);
-               ext4fs_devread(SUPERBLOCK_SECTOR, 0, SUPERBLOCK_SIZE,
-                              (char *)fs->sb);
+               ext4_read_superblock((char *)fs->sb);
 
                blknr = read_allocated_block(&inode_journal,
                                         EXT2_JOURNAL_SUPERBLOCK);
@@ -576,7 +560,8 @@ static void update_descriptor_block(long int blknr)
        ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal);
        jsb_blknr = read_allocated_block(&inode_journal,
                                         EXT2_JOURNAL_SUPERBLOCK);
-       ext4fs_devread(jsb_blknr * fs->sect_perblk, 0, fs->blksz, temp_buff);
+       ext4fs_devread((lbaint_t)jsb_blknr * fs->sect_perblk, 0, fs->blksz,
+                      temp_buff);
        jsb = (struct journal_superblock_t *) temp_buff;
 
        jdb.h_blocktype = cpu_to_be32(EXT3_JOURNAL_DESCRIPTOR_BLOCK);
@@ -623,10 +608,12 @@ static void update_commit_block(long int blknr)
        if (!temp_buff)
                return;
 
-       ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO, &inode_journal);
+       ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO,
+                         &inode_journal);
        jsb_blknr = read_allocated_block(&inode_journal,
                                         EXT2_JOURNAL_SUPERBLOCK);
-       ext4fs_devread(jsb_blknr * fs->sect_perblk, 0, fs->blksz, temp_buff);
+       ext4fs_devread((lbaint_t)jsb_blknr * fs->sect_perblk, 0, fs->blksz,
+                      temp_buff);
        jsb = (struct journal_superblock_t *) temp_buff;
 
        jdb.h_blocktype = cpu_to_be32(EXT3_JOURNAL_COMMIT_BLOCK);