ARM: rmobile: Represent SF partitioning with mtdparts on Lager

[u-boot] / fs / reiserfs / dev.c

diff --git a/fs/reiserfs/dev.c b/fs/reiserfs/dev.c
index 68255458d5101a9cd302563bd6b97352d8aa2ea2..c6b67795df5c44f93770064f9d8c7cc2551ce8e1 100644 (file)
--- a/fs/reiserfs/dev.c
+++ b/fs/reiserfs/dev.c
@@ -1,98 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  *  (C) Copyright 2003 - 2004
  *  Sysgo AG, <www.elinos.com>, Pavel Bartusek <pba@sysgo.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 
 #include <common.h>
 #include <config.h>
 #include <reiserfs.h>
-
+#include <fs_internal.h>
 #include "reiserfs_private.h"
 
-static block_dev_desc_t *reiserfs_block_dev_desc;
+static struct blk_desc *reiserfs_blk_desc;
 static disk_partition_t *part_info;
 
 
-void reiserfs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info)
+void reiserfs_set_blk_dev(struct blk_desc *rbdd, disk_partition_t *info)
 {
-       reiserfs_block_dev_desc = rbdd;
+       reiserfs_blk_desc = rbdd;
        part_info = info;
 }
 
-
-int reiserfs_devread (int sector, int byte_offset, int byte_len, char *buf)
+int reiserfs_devread(int sector, int byte_offset, int byte_len, char *buf)
 {
-       char sec_buf[SECTOR_SIZE];
-       unsigned block_len;
-/*
-       unsigned len = byte_len;
-       u8 *start = buf;
-*/
-       /*
-       *  Check partition boundaries
-       */
-       if (sector < 0
-           || ((sector + ((byte_offset + byte_len - 1) >> SECTOR_BITS))
-           >= part_info->size)) {
-/*             errnum = ERR_OUTSIDE_PART; */
-               printf (" ** reiserfs_devread() read outside partition\n");
-               return 0;
-       }
-
-       /*
-        *  Get the read to the beginning of a partition.
-        */
-       sector += byte_offset >> SECTOR_BITS;
-       byte_offset &= SECTOR_SIZE - 1;
-
-#if defined(DEBUG)
-       printf (" <%d, %d, %d> ", sector, byte_offset, byte_len);
-#endif
-
-
-       if (reiserfs_block_dev_desc == NULL)
-               return 0;
-
-
-       if (byte_offset != 0) {
-               /* read first part which isn't aligned with start of sector */
-               if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
-                   part_info->start + sector, 1,
-                   (unsigned long *)sec_buf) != 1) {
-                       printf (" ** reiserfs_devread() read error\n");
-                       return 0;
-               }
-               memcpy(buf, sec_buf+byte_offset, min(SECTOR_SIZE-byte_offset, byte_len));
-               buf+=min(SECTOR_SIZE-byte_offset, byte_len);
-               byte_len-=min(SECTOR_SIZE-byte_offset, byte_len);
-               sector++;
-       }
-
-       /* read sector aligned part */
-       block_len = byte_len & ~(SECTOR_SIZE-1);
-       if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
-           part_info->start + sector, block_len/SECTOR_SIZE,
-           (unsigned long *)buf) != block_len/SECTOR_SIZE) {
-               printf (" ** reiserfs_devread() read error - block\n");
-               return 0;
-       }
-       buf+=block_len;
-       byte_len-=block_len;
-       sector+= block_len/SECTOR_SIZE;
-
-       if ( byte_len != 0 ) {
-               /* read rest of data which are not in whole sector */
-               if (reiserfs_block_dev_desc->block_read(reiserfs_block_dev_desc->dev,
-                   part_info->start + sector, 1,
-                   (unsigned long *)sec_buf) != 1) {
-                       printf (" ** reiserfs_devread() read error - last part\n");
-                       return 0;
-               }
-               memcpy(buf, sec_buf, byte_len);
-       }
-
-       return 1;
+       return fs_devread(reiserfs_blk_desc, part_info, sector, byte_offset,
+                         byte_len, buf);
 }