SPDX: Convert all of our single license tags to Linux Kernel style

[oweals/u-boot.git] / fs / ext4 / dev.c

diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c
index 787e04133a5dd23b1e4f627fa634d624a61b0dfb..29076880bccc200efa5404ac3f23880eaedc9cfe 100644 (file)
--- a/fs/ext4/dev.c
+++ b/fs/ext4/dev.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2011 - 2012 Samsung Electronics
  * EXT4 filesystem implementation in Uboot by
@@ -13,8 +14,6 @@
  *
  * (C) Copyright 2003 - 2004
  * Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -24,115 +23,34 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <config.h>
+#include <fs_internal.h>
 #include <ext4fs.h>
 #include <ext_common.h>
 #include "ext4_common.h"
 
 lbaint_t part_offset;
 
-static block_dev_desc_t *ext4fs_block_dev_desc;
+static struct blk_desc *ext4fs_blk_desc;
 static disk_partition_t *part_info;
 
-void ext4fs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info)
+void ext4fs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info)
 {
        assert(rbdd->blksz == (1 << rbdd->log2blksz));
-       ext4fs_block_dev_desc = rbdd;
+       ext4fs_blk_desc = rbdd;
        get_fs()->dev_desc = rbdd;
        part_info = info;
        part_offset = info->start;
-       get_fs()->total_sect = (info->size * info->blksz) >>
+       get_fs()->total_sect = ((uint64_t)info->size * info->blksz) >>
                get_fs()->dev_desc->log2blksz;
 }
 
-int ext4fs_devread(lbaint_t sector, int byte_offset, int byte_len, char *buf)
+int ext4fs_devread(lbaint_t sector, int byte_offset, int byte_len,
+                  char *buffer)
 {
-       unsigned block_len;
-       int log2blksz = ext4fs_block_dev_desc->log2blksz;
-       ALLOC_CACHE_ALIGN_BUFFER(char, sec_buf, (ext4fs_block_dev_desc ?
-                                                ext4fs_block_dev_desc->blksz :
-                                                0));
-       if (ext4fs_block_dev_desc == NULL) {
-               printf("** Invalid Block Device Descriptor (NULL)\n");
-               return 0;
-       }
-
-       /* Check partition boundaries */
-       if ((sector < 0) ||
-           ((sector + ((byte_offset + byte_len - 1) >> log2blksz))
-            >= part_info->size)) {
-               printf("%s read outside partition " LBAFU "\n", __func__,
-                      sector);
-               return 0;
-       }
-
-       /* Get the read to the beginning of a partition */
-       sector += byte_offset >> log2blksz;
-       byte_offset &= ext4fs_block_dev_desc->blksz - 1;
-
-       debug(" <" LBAFU ", %d, %d>\n", sector, byte_offset, byte_len);
-
-       if (byte_offset != 0) {
-               /* read first part which isn't aligned with start of sector */
-               if (ext4fs_block_dev_desc->
-                   block_read(ext4fs_block_dev_desc->dev,
-                               part_info->start + sector, 1,
-                               (unsigned long *) sec_buf) != 1) {
-                       printf(" ** ext2fs_devread() read error **\n");
-                       return 0;
-               }
-               memcpy(buf, sec_buf + byte_offset,
-                       min(ext4fs_block_dev_desc->blksz
-                           - byte_offset, byte_len));
-               buf += min(ext4fs_block_dev_desc->blksz
-                          - byte_offset, byte_len);
-               byte_len -= min(ext4fs_block_dev_desc->blksz
-                               - byte_offset, byte_len);
-               sector++;
-       }
-
-       if (byte_len == 0)
-               return 1;
-
-       /* read sector aligned part */
-       block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
-
-       if (block_len == 0) {
-               ALLOC_CACHE_ALIGN_BUFFER(u8, p, ext4fs_block_dev_desc->blksz);
-
-               block_len = ext4fs_block_dev_desc->blksz;
-               ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc->dev,
-                                                 part_info->start + sector,
-                                                 1, (unsigned long *)p);
-               memcpy(buf, p, byte_len);
-               return 1;
-       }
-
-       if (ext4fs_block_dev_desc->block_read(ext4fs_block_dev_desc->dev,
-                                              part_info->start + sector,
-                                              block_len >> log2blksz,
-                                              (unsigned long *) buf) !=
-                                              block_len >> log2blksz) {
-               printf(" ** %s read error - block\n", __func__);
-               return 0;
-       }
-       block_len = byte_len & ~(ext4fs_block_dev_desc->blksz - 1);
-       buf += block_len;
-       byte_len -= block_len;
-       sector += block_len / ext4fs_block_dev_desc->blksz;
-
-       if (byte_len != 0) {
-               /* read rest of data which are not in whole sector */
-               if (ext4fs_block_dev_desc->
-                   block_read(ext4fs_block_dev_desc->dev,
-                               part_info->start + sector, 1,
-                               (unsigned long *) sec_buf) != 1) {
-                       printf("* %s read error - last part\n", __func__);
-                       return 0;
-               }
-               memcpy(buf, sec_buf, byte_len);
-       }
-       return 1;
+       return fs_devread(get_fs()->dev_desc, part_info, sector, byte_offset,
+                         byte_len, buffer);
 }
 
 int ext4_read_superblock(char *buffer)