Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-16 09:48:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/fs/ext4/ext4_write.c

1026 lines
28 KiB
C
Raw Normal View History

SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
2018-05-06 21:58:06 +00:00
// SPDX-License-Identifier: GPL-2.0+
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/*
* (C) Copyright 2011 - 2012 Samsung Electronics
* EXT4 filesystem implementation in Uboot by
* Uma Shankar <uma.shankar@samsung.com>
* Manjunatha C Achar <a.manjunatha@samsung.com>
*
* ext4ls and ext4load : Based on ext2 ls and load support in Uboot.
* Ext4 read optimization taken from Open-Moko
* Qi bootloader
*
* (C) Copyright 2004
* esd gmbh <www.esd-electronics.com>
* Reinhard Arlt <reinhard.arlt@esd-electronics.com>
*
* based on code from grub2 fs/ext2.c and fs/fshelp.c by
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
*
* ext4write : Based on generic ext4 protocol.
*/
#include <common.h>
Move ALLOC_CACHE_ALIGN_BUFFER() to the new memalign.h header Now that we have a new header file for cache-aligned allocation, we should move the stack-based allocation macro there also. Signed-off-by: Simon Glass <sjg@chromium.org>
2015-09-02 23:24:58 +00:00
#include <memalign.h>
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
#include <linux/stat.h>
#include <div64.h>
#include "ext4_common.h"
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
static inline void ext4fs_sb_free_inodes_inc(struct ext2_sblock *sb)
{
sb->free_inodes = cpu_to_le32(le32_to_cpu(sb->free_inodes) + 1);
}
static inline void ext4fs_sb_free_blocks_inc(struct ext2_sblock *sb)
{
sb->free_blocks = cpu_to_le32(le32_to_cpu(sb->free_blocks) + 1);
}
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
static inline void ext4fs_bg_free_inodes_inc
(struct ext2_block_group *bg, const struct ext_filesystem *fs)
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
{
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
uint32_t free_inodes = le16_to_cpu(bg->free_inodes);
if (fs->gdsize == 64)
free_inodes += le16_to_cpu(bg->free_inodes_high) << 16;
free_inodes++;
bg->free_inodes = cpu_to_le16(free_inodes & 0xffff);
if (fs->gdsize == 64)
bg->free_inodes_high = cpu_to_le16(free_inodes >> 16);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
}
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
static inline void ext4fs_bg_free_blocks_inc
(struct ext2_block_group *bg, const struct ext_filesystem *fs)
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
{
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
uint32_t free_blocks = le16_to_cpu(bg->free_blocks);
if (fs->gdsize == 64)
free_blocks += le16_to_cpu(bg->free_blocks_high) << 16;
free_blocks++;
bg->free_blocks = cpu_to_le16(free_blocks & 0xffff);
if (fs->gdsize == 64)
bg->free_blocks_high = cpu_to_le16(free_blocks >> 16);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
}
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
static void ext4fs_update(void)
{
short i;
ext4fs_update_journal();
struct ext_filesystem *fs = get_fs();
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
struct ext2_block_group *bgd = NULL;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* update super block */
put_ext4((uint64_t)(SUPERBLOCK_SIZE),
(struct ext2_sblock *)fs->sb, (uint32_t)SUPERBLOCK_SIZE);
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* update block bitmaps */
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
for (i = 0; i < fs->no_blkgrp; i++) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
bgd = ext4fs_get_group_descriptor(fs, i);
bgd->bg_checksum = cpu_to_le16(ext4fs_checksum_update(i));
uint64_t b_bitmap_blk = ext4fs_bg_get_block_id(bgd, fs);
put_ext4(b_bitmap_blk * fs->blksz,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->blk_bmaps[i], fs->blksz);
}
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* update inode bitmaps */
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
for (i = 0; i < fs->no_blkgrp; i++) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
bgd = ext4fs_get_group_descriptor(fs, i);
uint64_t i_bitmap_blk = ext4fs_bg_get_inode_id(bgd, fs);
put_ext4(i_bitmap_blk * fs->blksz,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->inode_bmaps[i], fs->blksz);
}
/* update the block group descriptor table */
fs/ext4: fix calling put_ext4 with truncated offset Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
2014-01-08 00:15:33 +00:00
put_ext4((uint64_t)((uint64_t)fs->gdtable_blkno * (uint64_t)fs->blksz),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
(struct ext2_block_group *)fs->gdtable,
(fs->blksz * fs->no_blk_pergdt));
ext4fs_dump_metadata();
gindex = 0;
gd_index = 0;
}
int ext4fs_get_bgdtable(void)
{
int status;
struct ext_filesystem *fs = get_fs();
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
int gdsize_total = ROUND(fs->no_blkgrp * fs->gdsize, fs->blksz);
fs->no_blk_pergdt = gdsize_total / fs->blksz;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* allocate memory for gdtable */
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
fs->gdtable = zalloc(gdsize_total);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (!fs->gdtable)
return -ENOMEM;
/* read the group descriptor table */
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
status = ext4fs_devread((lbaint_t)fs->gdtable_blkno * fs->sect_perblk,
0, fs->blksz * fs->no_blk_pergdt, fs->gdtable);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (status == 0)
goto fail;
if (ext4fs_log_gdt(fs->gdtable)) {
printf("Error in ext4fs_log_gdt\n");
return -1;
}
return 0;
fail:
free(fs->gdtable);
fs->gdtable = NULL;
return -1;
}
static void delete_single_indirect_block(struct ext2_inode *inode)
{
struct ext2_block_group *bgd = NULL;
static int prev_bg_bmap_idx = -1;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blknr;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
int remainder;
int bg_idx;
int status;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blk_per_grp = le32_to_cpu(ext4fs_root->sblock.blocks_per_group);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext_filesystem *fs = get_fs();
char *journal_buffer = zalloc(fs->blksz);
if (!journal_buffer) {
printf("No memory\n");
return;
}
/* deleting the single indirect block associated with inode */
if (inode->b.blocks.indir_block != 0) {
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
blknr = le32_to_cpu(inode->b.blocks.indir_block);
debug("SIPB releasing %u\n", blknr);
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
bg_idx = blknr / blk_per_grp;
if (fs->blksz == 1024) {
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
remainder = blknr % blk_per_grp;
if (!remainder)
bg_idx--;
}
ext4fs_reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx);
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk = ext4fs_bg_get_block_id(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
status = ext4fs_devread(
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
b_bitmap_blk * fs->sect_perblk,
0, fs->blksz, journal_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (status == 0)
goto fail;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
if (ext4fs_log_journal(journal_buffer, b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
}
fail:
free(journal_buffer);
}
static void delete_double_indirect_block(struct ext2_inode *inode)
{
int i;
short status;
static int prev_bg_bmap_idx = -1;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blknr;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
int remainder;
int bg_idx;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blk_per_grp = le32_to_cpu(ext4fs_root->sblock.blocks_per_group);
__le32 *di_buffer = NULL;
void *dib_start_addr = NULL;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext2_block_group *bgd = NULL;
struct ext_filesystem *fs = get_fs();
char *journal_buffer = zalloc(fs->blksz);
if (!journal_buffer) {
printf("No memory\n");
return;
}
if (inode->b.blocks.double_indir_block != 0) {
di_buffer = zalloc(fs->blksz);
if (!di_buffer) {
printf("No memory\n");
return;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
dib_start_addr = di_buffer;
blknr = le32_to_cpu(inode->b.blocks.double_indir_block);
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0,
fs->blksz, (char *)di_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
for (i = 0; i < fs->blksz / sizeof(int); i++) {
if (*di_buffer == 0)
break;
debug("DICB releasing %u\n", *di_buffer);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
bg_idx = le32_to_cpu(*di_buffer) / blk_per_grp;
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
if (fs->blksz == 1024) {
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
remainder = le32_to_cpu(*di_buffer) % blk_per_grp;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (!remainder)
bg_idx--;
}
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_reset_block_bmap(le32_to_cpu(*di_buffer),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->blk_bmaps[bg_idx], bg_idx);
di_buffer++;
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk =
ext4fs_bg_get_block_id(bgd, fs);
status = ext4fs_devread(b_bitmap_blk
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
* fs->sect_perblk, 0,
fs->blksz,
journal_buffer);
if (status == 0)
goto fail;
if (ext4fs_log_journal(journal_buffer,
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
}
/* removing the parent double indirect block */
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
blknr = le32_to_cpu(inode->b.blocks.double_indir_block);
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
bg_idx = blknr / blk_per_grp;
if (fs->blksz == 1024) {
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
remainder = blknr % blk_per_grp;
if (!remainder)
bg_idx--;
}
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
ext4fs_reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk = ext4fs_bg_get_block_id(bgd, fs);
status = ext4fs_devread(b_bitmap_blk * fs->sect_perblk,
0, fs->blksz, journal_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (status == 0)
goto fail;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
if (ext4fs_log_journal(journal_buffer, b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
debug("DIPB releasing %d\n", blknr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
}
fail:
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
free(dib_start_addr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
free(journal_buffer);
}
static void delete_triple_indirect_block(struct ext2_inode *inode)
{
int i, j;
short status;
static int prev_bg_bmap_idx = -1;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blknr;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
int remainder;
int bg_idx;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blk_per_grp = le32_to_cpu(ext4fs_root->sblock.blocks_per_group);
__le32 *tigp_buffer = NULL;
void *tib_start_addr = NULL;
__le32 *tip_buffer = NULL;
void *tipb_start_addr = NULL;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext2_block_group *bgd = NULL;
struct ext_filesystem *fs = get_fs();
char *journal_buffer = zalloc(fs->blksz);
if (!journal_buffer) {
printf("No memory\n");
return;
}
if (inode->b.blocks.triple_indir_block != 0) {
tigp_buffer = zalloc(fs->blksz);
if (!tigp_buffer) {
printf("No memory\n");
return;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
tib_start_addr = tigp_buffer;
blknr = le32_to_cpu(inode->b.blocks.triple_indir_block);
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0,
fs->blksz, (char *)tigp_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
for (i = 0; i < fs->blksz / sizeof(int); i++) {
if (*tigp_buffer == 0)
break;
debug("tigp buffer releasing %u\n", *tigp_buffer);
tip_buffer = zalloc(fs->blksz);
if (!tip_buffer)
goto fail;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
tipb_start_addr = tip_buffer;
status = ext4fs_devread((lbaint_t)le32_to_cpu(*tigp_buffer) *
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->sect_perblk, 0, fs->blksz,
(char *)tip_buffer);
for (j = 0; j < fs->blksz / sizeof(int); j++) {
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
if (le32_to_cpu(*tip_buffer) == 0)
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
break;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
bg_idx = le32_to_cpu(*tip_buffer) / blk_per_grp;
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
if (fs->blksz == 1024) {
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
remainder = le32_to_cpu(*tip_buffer) % blk_per_grp;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (!remainder)
bg_idx--;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_reset_block_bmap(le32_to_cpu(*tip_buffer),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->blk_bmaps[bg_idx],
bg_idx);
tip_buffer++;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk =
ext4fs_bg_get_block_id(bgd, fs);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
status =
ext4fs_devread(
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
b_bitmap_blk *
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->sect_perblk, 0,
fs->blksz,
journal_buffer);
if (status == 0)
goto fail;
if (ext4fs_log_journal(journal_buffer,
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
}
free(tipb_start_addr);
tipb_start_addr = NULL;
/*
* removing the grand parent blocks
* which is connected to inode
*/
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
bg_idx = le32_to_cpu(*tigp_buffer) / blk_per_grp;
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
if (fs->blksz == 1024) {
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
remainder = le32_to_cpu(*tigp_buffer) % blk_per_grp;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (!remainder)
bg_idx--;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_reset_block_bmap(le32_to_cpu(*tigp_buffer),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->blk_bmaps[bg_idx], bg_idx);
tigp_buffer++;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk =
ext4fs_bg_get_block_id(bgd, fs);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
memset(journal_buffer, '\0', fs->blksz);
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
status = ext4fs_devread(b_bitmap_blk *
fs->sect_perblk, 0,
fs->blksz,
journal_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (status == 0)
goto fail;
if (ext4fs_log_journal(journal_buffer,
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
}
/* removing the grand parent triple indirect block */
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
blknr = le32_to_cpu(inode->b.blocks.triple_indir_block);
fs:ext4:cleanup: Remove superfluous code Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:04 +00:00
bg_idx = blknr / blk_per_grp;
if (fs->blksz == 1024) {
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
remainder = blknr % blk_per_grp;
if (!remainder)
bg_idx--;
}
ext4fs_reset_block_bmap(blknr, fs->blk_bmaps[bg_idx], bg_idx);
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk = ext4fs_bg_get_block_id(bgd, fs);
status = ext4fs_devread(b_bitmap_blk * fs->sect_perblk,
0, fs->blksz, journal_buffer);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (status == 0)
goto fail;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
if (ext4fs_log_journal(journal_buffer, b_bitmap_blk))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
debug("tigp buffer itself releasing %d\n", blknr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
}
fail:
free(tib_start_addr);
free(tipb_start_addr);
free(journal_buffer);
}
static int ext4fs_delete_file(int inodeno)
{
struct ext2_inode inode;
short status;
int i;
int remainder;
long int blknr;
int bg_idx;
int ibmap_idx;
char *read_buffer = NULL;
char *start_block_address = NULL;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t no_blocks;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
static int prev_bg_bmap_idx = -1;
unsigned int inodes_per_block;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blkno;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
unsigned int blkoff;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blk_per_grp = le32_to_cpu(ext4fs_root->sblock.blocks_per_group);
uint32_t inode_per_grp = le32_to_cpu(ext4fs_root->sblock.inodes_per_group);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext2_inode *inode_buffer = NULL;
struct ext2_block_group *bgd = NULL;
struct ext_filesystem *fs = get_fs();
char *journal_buffer = zalloc(fs->blksz);
if (!journal_buffer)
return -ENOMEM;
status = ext4fs_read_inode(ext4fs_root, inodeno, &inode);
if (status == 0)
goto fail;
/* read the block no allocated to a file */
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
no_blocks = le32_to_cpu(inode.size) / fs->blksz;
if (le32_to_cpu(inode.size) % fs->blksz)
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
no_blocks++;
if (le32_to_cpu(inode.flags) & EXT4_EXTENTS_FL) {
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
/* FIXME delete extent index blocks, i.e. eh_depth >= 1 */
struct ext4_extent_header *eh =
(struct ext4_extent_header *)
inode.b.blocks.dir_blocks;
debug("del: dep=%d entries=%d\n", eh->eh_depth, eh->eh_entries);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
} else {
delete_single_indirect_block(&inode);
delete_double_indirect_block(&inode);
delete_triple_indirect_block(&inode);
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
}
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
/* release data blocks */
for (i = 0; i < no_blocks; i++) {
blknr = read_allocated_block(&inode, i);
ext4: Correct block number handling, empty block vs. error code read_allocated block may return block number 0, which is just an indicator a chunk of the file is not backed by a block, i.e. it is sparse. During file deletions, just continue with the next logical block, for other operations treat blocknumber <= 0 as an error. For writes, blocknumber 0 should never happen, as U-Boot always allocates blocks for the whole file. Reading already handles this correctly, i.e. the read buffer is 0-fillled. Not treating block 0 as sparse block leads to FS corruption, e.g. ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /2.5GB.file 1 ' The 2.5GB.file from the fs test is actually a sparse file. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:55 +00:00
if (blknr == 0)
continue;
if (blknr < 0)
goto fail;
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
bg_idx = blknr / blk_per_grp;
if (fs->blksz == 1024) {
remainder = blknr % blk_per_grp;
if (!remainder)
bg_idx--;
}
ext4fs_reset_block_bmap(blknr, fs->blk_bmaps[bg_idx],
bg_idx);
debug("EXT4 Block releasing %ld: %d\n", blknr, bg_idx);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, bg_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_blocks_inc(bgd, fs);
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
ext4fs_sb_free_blocks_inc(fs->sb);
/* journal backup */
if (prev_bg_bmap_idx != bg_idx) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
uint64_t b_bitmap_blk = ext4fs_bg_get_block_id(bgd, fs);
status = ext4fs_devread(b_bitmap_blk * fs->sect_perblk,
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
0, fs->blksz,
journal_buffer);
if (status == 0)
goto fail;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
if (ext4fs_log_journal(journal_buffer, b_bitmap_blk))
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
goto fail;
prev_bg_bmap_idx = bg_idx;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
}
}
ext4: remove duplicated block release code for extents The data blocks are identical for files using traditional direct/indirect block allocation scheme and extent trees, thus this code part can be common. Only the code to deallocate the indirect blocks to record the used blocks has to be seperate, respectively the code to release extent tree index blocks. Actually the code to release the extent tree index blocks is still missing, but at least add a FIXME at the appropriate place. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:54 +00:00
/* release inode */
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* from the inode no to blockno */
inodes_per_block = fs->blksz / fs->inodesz;
ibmap_idx = inodeno / inode_per_grp;
/* get the block no */
inodeno--;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
/* get block group descriptor table */
bgd = ext4fs_get_group_descriptor(fs, ibmap_idx);
blkno = ext4fs_bg_get_inode_table_id(bgd, fs) +
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
(inodeno % inode_per_grp) / inodes_per_block;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* get the offset of the inode */
blkoff = ((inodeno) % inodes_per_block) * fs->inodesz;
/* read the block no containing the inode */
read_buffer = zalloc(fs->blksz);
if (!read_buffer)
goto fail;
start_block_address = read_buffer;
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
status = ext4fs_devread((lbaint_t)blkno * fs->sect_perblk,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
0, fs->blksz, read_buffer);
if (status == 0)
goto fail;
if (ext4fs_log_journal(read_buffer, blkno))
goto fail;
read_buffer = read_buffer + blkoff;
inode_buffer = (struct ext2_inode *)read_buffer;
ext4: initialize full inode for inodes bigger than 128 bytes Make sure the the extra_isize field (offset 128) is initialized to 0, to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:53 +00:00
memset(inode_buffer, '\0', fs->inodesz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* write the inode to original position in inode table */
if (ext4fs_put_metadata(start_block_address, blkno))
goto fail;
/* update the respective inode bitmaps */
inodeno++;
ext4fs_reset_inode_bmap(inodeno, fs->inode_bmaps[ibmap_idx], ibmap_idx);
ext4: Respect group descriptor size when adjusting free counts Also adjust high 16/32 bits when free inode/block counts are modified. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-19 23:13:01 +00:00
ext4fs_bg_free_inodes_inc(bgd, fs);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ext4fs_sb_free_inodes_inc(fs->sb);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* journal backup */
memset(journal_buffer, '\0', fs->blksz);
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
status = ext4fs_devread(ext4fs_bg_get_inode_id(bgd, fs) *
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->sect_perblk, 0, fs->blksz, journal_buffer);
if (status == 0)
goto fail;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
if (ext4fs_log_journal(journal_buffer, ext4fs_bg_get_inode_id(bgd, fs)))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
ext4fs_update();
ext4fs_deinit();
fs:ext4:write:fix: Reinitialize global variables after updating a file This bug shows up when file stored on the ext4 file system is updated. The ext4fs_delete_file() is responsible for deleting file's (e.g. uImage) data. However some global data (especially ext4fs_indir2_block), which is used during file deletion are left unchanged. The ext4fs_indir2_block pointer stores reference to old ext4 double indirect allocated blocks. When it is unchanged, after file deletion, ext4fs_write_file() uses the same pointer (since it is already initialized - i.e. not NULL) to return number of blocks to write. This trunks larger file when previous one was smaller. Lets consider following scenario: 1. Flash target with ext4 formatted boot.img (which has uImage [*] on itself) 2. Developer wants to upload their custom uImage [**] - When new uImage [**] is smaller than the [*] - everything works correctly - we are able to store the whole smaller file with corrupted ext4fs_indir2_block pointer - When new uImage [**] is larger than the [*] - theCRC is corrupted, since truncation on data stored at eMMC was done. 3. When uImage CRC error appears, then reboot and LTHOR/DFU reflashing causes proper setting of ext4fs_indir2_block() and after that uImage[**] is successfully stored (correct uImage [*] metadata is stored at an eMMC on the first flashing). Due to above the bug was very difficult to reproduce. This patch sets default values for all ext4fs_indir* pointers/variables. Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
2014-05-06 07:36:05 +00:00
ext4fs_reinit_global();
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (ext4fs_init() != 0) {
printf("error in File System init\n");
goto fail;
}
free(start_block_address);
free(journal_buffer);
return 0;
fail:
free(start_block_address);
free(journal_buffer);
return -1;
}
int ext4fs_init(void)
{
short status;
int i;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t real_free_blocks = 0;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext_filesystem *fs = get_fs();
/* populate fs */
fs->blksz = EXT2_BLOCK_SIZE(ext4fs_root);
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
fs->sect_perblk = fs->blksz >> fs->dev_desc->log2blksz;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* get the superblock */
fs->sb = zalloc(SUPERBLOCK_SIZE);
if (!fs->sb)
return -ENOMEM;
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
if (!ext4_read_superblock((char *)fs->sb))
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
/* init journal */
if (ext4fs_init_journal())
goto fail;
/* get total no of blockgroups */
fs->no_blkgrp = (uint32_t)ext4fs_div_roundup(
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
le32_to_cpu(ext4fs_root->sblock.total_blocks)
- le32_to_cpu(ext4fs_root->sblock.first_data_block),
le32_to_cpu(ext4fs_root->sblock.blocks_per_group));
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* get the block group descriptor table */
fs->gdtable_blkno = ((EXT2_MIN_BLOCK_SIZE == fs->blksz) + 1);
if (ext4fs_get_bgdtable() == -1) {
printf("Error in getting the block group descriptor table\n");
goto fail;
}
/* load all the available bitmap block of the partition */
fs->blk_bmaps = zalloc(fs->no_blkgrp * sizeof(char *));
if (!fs->blk_bmaps)
goto fail;
for (i = 0; i < fs->no_blkgrp; i++) {
fs->blk_bmaps[i] = zalloc(fs->blksz);
if (!fs->blk_bmaps[i])
goto fail;
}
for (i = 0; i < fs->no_blkgrp; i++) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
struct ext2_block_group *bgd =
ext4fs_get_group_descriptor(fs, i);
status = ext4fs_devread(ext4fs_bg_get_block_id(bgd, fs) *
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
fs->sect_perblk, 0,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
fs->blksz, (char *)fs->blk_bmaps[i]);
if (status == 0)
goto fail;
}
/* load all the available inode bitmap of the partition */
fs->inode_bmaps = zalloc(fs->no_blkgrp * sizeof(unsigned char *));
if (!fs->inode_bmaps)
goto fail;
for (i = 0; i < fs->no_blkgrp; i++) {
fs->inode_bmaps[i] = zalloc(fs->blksz);
if (!fs->inode_bmaps[i])
goto fail;
}
for (i = 0; i < fs->no_blkgrp; i++) {
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
struct ext2_block_group *bgd =
ext4fs_get_group_descriptor(fs, i);
status = ext4fs_devread(ext4fs_bg_get_inode_id(bgd, fs) *
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
fs->sect_perblk,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
0, fs->blksz,
(char *)fs->inode_bmaps[i]);
if (status == 0)
goto fail;
}
/*
* check filesystem consistency with free blocks of file system
* some time we observed that superblock freeblocks does not match
* with the blockgroups freeblocks when improper
* reboot of a linux kernel
*/
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
for (i = 0; i < fs->no_blkgrp; i++) {
struct ext2_block_group *bgd =
ext4fs_get_group_descriptor(fs, i);
real_free_blocks = real_free_blocks +
ext4fs_bg_get_free_blocks(bgd, fs);
}
if (real_free_blocks != ext4fs_sb_get_free_blocks(fs->sb))
ext4fs_sb_set_free_blocks(fs->sb, real_free_blocks);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
return 0;
fail:
ext4fs_deinit();
return -1;
}
void ext4fs_deinit(void)
{
int i;
struct ext2_inode inode_journal;
struct journal_superblock_t *jsb;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t blknr;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext_filesystem *fs = get_fs();
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t new_feature_incompat;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* free journal */
char *temp_buff = zalloc(fs->blksz);
if (temp_buff) {
ext4fs_read_inode(ext4fs_root, EXT2_JOURNAL_INO,
&inode_journal);
blknr = read_allocated_block(&inode_journal,
EXT2_JOURNAL_SUPERBLOCK);
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, fs->blksz,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
temp_buff);
jsb = (struct journal_superblock_t *)temp_buff;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
jsb->s_start = 0;
fs/ext4: fix calling put_ext4 with truncated offset Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
2014-01-08 00:15:33 +00:00
put_ext4((uint64_t) ((uint64_t)blknr * (uint64_t)fs->blksz),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
(struct journal_superblock_t *)temp_buff, fs->blksz);
free(temp_buff);
}
ext4fs_free_journal();
/* get the superblock */
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
ext4_read_superblock((char *)fs->sb);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
new_feature_incompat = le32_to_cpu(fs->sb->feature_incompat);
new_feature_incompat &= ~EXT3_FEATURE_INCOMPAT_RECOVER;
fs->sb->feature_incompat = cpu_to_le32(new_feature_incompat);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
put_ext4((uint64_t)(SUPERBLOCK_SIZE),
(struct ext2_sblock *)fs->sb, (uint32_t)SUPERBLOCK_SIZE);
free(fs->sb);
fs->sb = NULL;
if (fs->blk_bmaps) {
for (i = 0; i < fs->no_blkgrp; i++) {
free(fs->blk_bmaps[i]);
fs->blk_bmaps[i] = NULL;
}
free(fs->blk_bmaps);
fs->blk_bmaps = NULL;
}
if (fs->inode_bmaps) {
for (i = 0; i < fs->no_blkgrp; i++) {
free(fs->inode_bmaps[i]);
fs->inode_bmaps[i] = NULL;
}
free(fs->inode_bmaps);
fs->inode_bmaps = NULL;
}
free(fs->gdtable);
fs->gdtable = NULL;
/*
* reinitiliazed the global inode and
* block bitmap first execution check variables
*/
fs->first_pass_ibmap = 0;
fs->first_pass_bbmap = 0;
fs->curr_inode_no = 0;
fs->curr_blkno = 0;
}
ext4: Correct block number handling, empty block vs. error code read_allocated block may return block number 0, which is just an indicator a chunk of the file is not backed by a block, i.e. it is sparse. During file deletions, just continue with the next logical block, for other operations treat blocknumber <= 0 as an error. For writes, blocknumber 0 should never happen, as U-Boot always allocates blocks for the whole file. Reading already handles this correctly, i.e. the read buffer is 0-fillled. Not treating block 0 as sparse block leads to FS corruption, e.g. ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /2.5GB.file 1 ' The 2.5GB.file from the fs test is actually a sparse file. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:55 +00:00
/*
* Write data to filesystem blocks. Uses same optimization for
* contigous sectors as ext4fs_read_file
*/
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
static int ext4fs_write_file(struct ext2_inode *file_inode,
int pos, unsigned int len, char *buf)
{
int i;
int blockcnt;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
uint32_t filesize = le32_to_cpu(file_inode->size);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext_filesystem *fs = get_fs();
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
int log2blksz = fs->dev_desc->log2blksz;
int log2_fs_blocksize = LOG2_BLOCK_SIZE(ext4fs_root) - log2blksz;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
int previous_block_number = -1;
int delayed_start = 0;
int delayed_extent = 0;
int delayed_next = 0;
char *delayed_buf = NULL;
/* Adjust len so it we can't read past the end of the file. */
if (len > filesize)
len = filesize;
blockcnt = ((len + pos) + fs->blksz - 1) / fs->blksz;
for (i = pos / fs->blksz; i < blockcnt; i++) {
long int blknr;
int blockend = fs->blksz;
int skipfirst = 0;
blknr = read_allocated_block(file_inode, i);
ext4: Correct block number handling, empty block vs. error code read_allocated block may return block number 0, which is just an indicator a chunk of the file is not backed by a block, i.e. it is sparse. During file deletions, just continue with the next logical block, for other operations treat blocknumber <= 0 as an error. For writes, blocknumber 0 should never happen, as U-Boot always allocates blocks for the whole file. Reading already handles this correctly, i.e. the read buffer is 0-fillled. Not treating block 0 as sparse block leads to FS corruption, e.g. ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /2.5GB.file 1 ' The 2.5GB.file from the fs test is actually a sparse file. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:55 +00:00
if (blknr <= 0)
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
return -1;
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
blknr = blknr << log2_fs_blocksize;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (blknr) {
if (previous_block_number != -1) {
if (delayed_next == blknr) {
delayed_extent += blockend;
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
delayed_next += blockend >> log2blksz;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
} else { /* spill */
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
put_ext4((uint64_t)
fs/ext4: fix calling put_ext4 with truncated offset Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
2014-01-08 00:15:33 +00:00
((uint64_t)delayed_start << log2blksz),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
delayed_buf,
(uint32_t) delayed_extent);
previous_block_number = blknr;
delayed_start = blknr;
delayed_extent = blockend;
delayed_buf = buf;
delayed_next = blknr +
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
(blockend >> log2blksz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
}
} else {
previous_block_number = blknr;
delayed_start = blknr;
delayed_extent = blockend;
delayed_buf = buf;
delayed_next = blknr +
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
(blockend >> log2blksz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
}
} else {
if (previous_block_number != -1) {
/* spill */
fs/ext4: fix calling put_ext4 with truncated offset Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
2014-01-08 00:15:33 +00:00
put_ext4((uint64_t) ((uint64_t)delayed_start <<
fs/ext4: Support device block sizes != 512 bytes The 512 byte block size was hard coded in the ext4 file systems. Large harddisks today support bigger block sizes typically 4096 bytes. This patch removes this limitation. Signed-off-by: Egbert Eich <eich@suse.com>
2013-05-01 01:13:19 +00:00
log2blksz),
delayed_buf,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
(uint32_t) delayed_extent);
previous_block_number = -1;
}
memset(buf, 0, fs->blksz - skipfirst);
}
buf += fs->blksz - skipfirst;
}
if (previous_block_number != -1) {
/* spill */
fs/ext4: fix calling put_ext4 with truncated offset Curently, we are using 32 bit multiplication to calculate the offset, so the result will always be 32 bit. This can silently cause file system corruption when performing a write operation on partition larger than 4 GiB. This patch address the issue by simply promoting the terms to 64 bit, and let compilers decide how to do the multiplication efficiently. Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
2014-01-08 00:15:33 +00:00
put_ext4((uint64_t) ((uint64_t)delayed_start << log2blksz),
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
delayed_buf, (uint32_t) delayed_extent);
previous_block_number = -1;
}
return len;
}
int ext4fs_write(const char *fname, unsigned char *buffer,
unsigned long sizebytes)
{
int ret = 0;
struct ext2_inode *file_inode = NULL;
unsigned char *inode_buffer = NULL;
int parent_inodeno;
int inodeno;
time_t timestamp = 0;
uint64_t bytes_reqd_for_file;
unsigned int blks_reqd_for_file;
unsigned int blocks_remaining;
int existing_file_inodeno;
char *temp_ptr = NULL;
long int itable_blkno;
long int parent_itable_blkno;
long int blkoff;
struct ext2_sblock *sblock = &(ext4fs_root->sblock);
unsigned int inodes_per_block;
unsigned int ibmap_idx;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
struct ext2_block_group *bgd = NULL;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
struct ext_filesystem *fs = get_fs();
ALLOC_CACHE_ALIGN_BUFFER(char, filename, 256);
ext4: correctly zero filename Since ALLOC_CACHE_ALIGN_BUFFER declares a char* for filename sizeof(filename) is not the size of the buffer. Use the already known length instead. cc: Uma Shankar <uma.shankar@samsung.com> cc: Manjunatha C Achar <a.manjunatha@samsung.com> cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Acked-by: Marek Vasut <marex@denx.de>
2014-06-09 13:29:00 +00:00
memset(filename, 0x00, 256);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
ext4: initialize full inode for inodes bigger than 128 bytes Make sure the the extra_isize field (offset 128) is initialized to 0, to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:53 +00:00
g_parent_inode = zalloc(fs->inodesz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (!g_parent_inode)
goto fail;
if (ext4fs_init() != 0) {
printf("error in File System init\n");
return -1;
}
inodes_per_block = fs->blksz / fs->inodesz;
parent_inodeno = ext4fs_get_parent_inode_num(fname, filename, F_FILE);
if (parent_inodeno == -1)
goto fail;
if (ext4fs_iget(parent_inodeno, g_parent_inode))
goto fail;
ext4: Avoid corruption of directories with hash tree indexes While directories can be read using the old linear scan method, adding a new file would require updating the index tree (alternatively, the whole tree could be removed). Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:45 +00:00
/* do not mess up a directory using hash trees */
if (le32_to_cpu(g_parent_inode->flags) & EXT4_INDEX_FL) {
printf("hash tree directory\n");
goto fail;
}
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* check if the filename is already present in root */
ext4: fix possible crash on directory traversal, ignore deleted entries The following command triggers a segfault in search_dir: ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /./foo 0x10' The following command triggers a segfault in check_filename: ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /. 0x10' "." is the first entry in the directory, thus previous_dir is NULL. The whole previous_dir block in search_dir seems to be a bad copy from check_filename(...). As the changed data is not written to disk, the statement is mostly harmless, save the possible NULL-ptr reference. Typically a file is unlinked by extending the direntlen of the previous entry. If the entry is the first entry in the directory block, it is invalidated by setting inode=0. The inode==0 case is hard to trigger without crafted filesystems. It only hits if the first entry in a directory block is deleted and later a lookup for the entry (by name) is done. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:41 +00:00
existing_file_inodeno = ext4fs_filename_unlink(filename);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (existing_file_inodeno != -1) {
ret = ext4fs_delete_file(existing_file_inodeno);
fs->first_pass_bbmap = 0;
fs->curr_blkno = 0;
fs->first_pass_ibmap = 0;
fs->curr_inode_no = 0;
if (ret)
goto fail;
}
/* calucalate how many blocks required */
bytes_reqd_for_file = sizebytes;
blks_reqd_for_file = lldiv(bytes_reqd_for_file, fs->blksz);
if (do_div(bytes_reqd_for_file, fs->blksz) != 0) {
blks_reqd_for_file++;
debug("total bytes for a file %u\n", blks_reqd_for_file);
}
blocks_remaining = blks_reqd_for_file;
/* test for available space in partition */
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
if (le32_to_cpu(fs->sb->free_blocks) < blks_reqd_for_file) {
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
printf("Not enough space on partition !!!\n");
goto fail;
}
ext4: propagate error if creation of directory entry fails In case the dir entry creation failed, ext4fs_write would later overwrite a random inode, as inodeno was never initialized. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:42 +00:00
inodeno = ext4fs_update_parent_dentry(filename, FILETYPE_REG);
if (inodeno == -1)
goto fail;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* prepare file inode */
inode_buffer = zalloc(fs->inodesz);
if (!inode_buffer)
goto fail;
file_inode = (struct ext2_inode *)inode_buffer;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
file_inode->mode = cpu_to_le16(S_IFREG | S_IRWXU |
S_IRGRP | S_IROTH | S_IXGRP | S_IXOTH);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* ToDo: Update correct time */
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
file_inode->mtime = cpu_to_le32(timestamp);
file_inode->atime = cpu_to_le32(timestamp);
file_inode->ctime = cpu_to_le32(timestamp);
file_inode->nlinks = cpu_to_le16(1);
file_inode->size = cpu_to_le32(sizebytes);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
/* Allocate data blocks */
ext4fs_allocate_blocks(file_inode, blocks_remaining,
&blks_reqd_for_file);
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
file_inode->blockcnt = cpu_to_le32((blks_reqd_for_file * fs->blksz) >>
fs->dev_desc->log2blksz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
temp_ptr = zalloc(fs->blksz);
if (!temp_ptr)
goto fail;
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ibmap_idx = inodeno / le32_to_cpu(ext4fs_root->sblock.inodes_per_group);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
inodeno--;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
bgd = ext4fs_get_group_descriptor(fs, ibmap_idx);
itable_blkno = ext4fs_bg_get_inode_table_id(bgd, fs) +
ext4: use kernel names for byte swaps Instead of __{be,le}{16,32}_to_cpu use {be,le}{16,32}_to_cpu. Signed-off-by: Michael Walle <michael@walle.cc>
2016-08-29 08:46:44 +00:00
(inodeno % le32_to_cpu(sblock->inodes_per_group)) /
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
inodes_per_block;
blkoff = (inodeno % inodes_per_block) * fs->inodesz;
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
ext4fs_devread((lbaint_t)itable_blkno * fs->sect_perblk, 0, fs->blksz,
temp_ptr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (ext4fs_log_journal(temp_ptr, itable_blkno))
goto fail;
memcpy(temp_ptr + blkoff, inode_buffer, fs->inodesz);
if (ext4fs_put_metadata(temp_ptr, itable_blkno))
goto fail;
/* copy the file content into data blocks */
if (ext4fs_write_file(file_inode, 0, sizebytes, (char *)buffer) == -1) {
printf("Error in copying content\n");
ext4: Correct block number handling, empty block vs. error code read_allocated block may return block number 0, which is just an indicator a chunk of the file is not backed by a block, i.e. it is sparse. During file deletions, just continue with the next logical block, for other operations treat blocknumber <= 0 as an error. For writes, blocknumber 0 should never happen, as U-Boot always allocates blocks for the whole file. Reading already handles this correctly, i.e. the read buffer is 0-fillled. Not treating block 0 as sparse block leads to FS corruption, e.g. ./sandbox/u-boot -c 'host bind 0 ./sandbox/test/fs/3GB.ext4.img ; ext4write host 0 0 /2.5GB.file 1 ' The 2.5GB.file from the fs test is actually a sparse file. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-06 02:36:55 +00:00
/* FIXME: Deallocate data blocks */
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
goto fail;
}
ext4: fix endianess problems in ext4 write support All fields were accessed directly instead of using the proper byte swap functions. Thus, ext4 write support was only usable on little-endian architectures. Fix this. Signed-off-by: Michael Walle <michael@walle.cc>
2016-09-01 09:21:40 +00:00
ibmap_idx = parent_inodeno / le32_to_cpu(ext4fs_root->sblock.inodes_per_group);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
parent_inodeno--;
ext4: Use helper function to access group descriptor and its fields The descriptor size is variable, thus array indices are not generically applicable. The larger group descriptors also contain e.g. high parts of block numbers, which have to be read and written. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
2016-09-17 00:10:10 +00:00
bgd = ext4fs_get_group_descriptor(fs, ibmap_idx);
parent_itable_blkno = ext4fs_bg_get_inode_table_id(bgd, fs) +
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
(parent_inodeno %
ext4: use kernel names for byte swaps Instead of __{be,le}{16,32}_to_cpu use {be,le}{16,32}_to_cpu. Signed-off-by: Michael Walle <michael@walle.cc>
2016-08-29 08:46:44 +00:00
le32_to_cpu(sblock->inodes_per_group)) / inodes_per_block;
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
blkoff = (parent_inodeno % inodes_per_block) * fs->inodesz;
if (parent_itable_blkno != itable_blkno) {
memset(temp_ptr, '\0', fs->blksz);
Fix ext2/ext4 filesystem accesses beyond 2TiB With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type, which is required to represent block numbers for storage devices that exceed 2TiB (the block size usually is 512B), e.g. recent hard drives We now use lbaint_t for partition offset to reflect the lbaint_t change, and access partitions beyond or crossing the 2.1TiB limit. This required changes to signature of ext4fs_devread(), and type of all variables relatives to block sector. ext2/ext4 fs uses logical block represented by a 32 bit value. Logical block is a multiple of device block sector. To avoid overflow problem when calling ext4fs_devread(), we need to cast the sector parameter. Signed-off-by: Frédéric Leroy <fredo@starox.org>
2013-06-26 16:11:25 +00:00
ext4fs_devread((lbaint_t)parent_itable_blkno * fs->sect_perblk,
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
0, fs->blksz, temp_ptr);
if (ext4fs_log_journal(temp_ptr, parent_itable_blkno))
goto fail;
ext4: initialize full inode for inodes bigger than 128 bytes Make sure the the extra_isize field (offset 128) is initialized to 0, to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:53 +00:00
memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
if (ext4fs_put_metadata(temp_ptr, parent_itable_blkno))
goto fail;
} else {
/*
* If parent and child fall in same inode table block
* both should be kept in 1 buffer
*/
ext4: initialize full inode for inodes bigger than 128 bytes Make sure the the extra_isize field (offset 128) is initialized to 0, to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:53 +00:00
memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
gd_index--;
if (ext4fs_put_metadata(temp_ptr, itable_blkno))
goto fail;
}
ext4fs_update();
ext4fs_deinit();
fs->first_pass_bbmap = 0;
fs->curr_blkno = 0;
fs->first_pass_ibmap = 0;
fs->curr_inode_no = 0;
free(inode_buffer);
free(g_parent_inode);
ext4: Fix memory leak in case of failure temp_ptr should always be freed, even if the function is left via goto fail. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:51 +00:00
free(temp_ptr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
g_parent_inode = NULL;
return 0;
fail:
ext4fs_deinit();
free(inode_buffer);
free(g_parent_inode);
ext4: Fix memory leak in case of failure temp_ptr should always be freed, even if the function is left via goto fail. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2016-09-06 02:36:51 +00:00
free(temp_ptr);
ext4: Split write support into its own file This code seems to be entirely othogonal, so remove the #ifdef and put the condition in the Makefile instead. Signed-off-by: Simon Glass <sjg@chromium.org>
2012-12-26 09:53:28 +00:00
g_parent_inode = NULL;
return -1;
}
ext4: Prepare API change for files greater than 2GB Change the internal EXT4 functions to use loff_t for offsets. Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> [trini: Update common/spl/spl_ext.c] Signed-off-by: Tom Rini <trini@ti.com>
2014-11-17 22:39:36 +00:00
int ext4_write_file(const char *filename, void *buf, loff_t offset,
loff_t len, loff_t *actwrite)
{
int ret;
if (offset != 0) {
printf("** Cannot support non-zero offset **\n");
return -1;
}
ret = ext4fs_write(filename, buf, len);
if (ret) {
printf("** Error ext4fs_write() **\n");
goto fail;
}
fs: ext4 write: return file len on success After rework of the file system API, the size of ext4 write was missed. This causes printing unreliable write size at the end of the file system write operation. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
2015-02-17 14:31:52 +00:00
*actwrite = len;
ext4: Prepare API change for files greater than 2GB Change the internal EXT4 functions to use loff_t for offsets. Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> [trini: Update common/spl/spl_ext.c] Signed-off-by: Tom Rini <trini@ti.com>
2014-11-17 22:39:36 +00:00
return 0;
fail:
fs: ext4 write: return file len on success After rework of the file system API, the size of ext4 write was missed. This causes printing unreliable write size at the end of the file system write operation. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
2015-02-17 14:31:52 +00:00
*actwrite = 0;
ext4: Prepare API change for files greater than 2GB Change the internal EXT4 functions to use loff_t for offsets. Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> [trini: Update common/spl/spl_ext.c] Signed-off-by: Tom Rini <trini@ti.com>
2014-11-17 22:39:36 +00:00
return -1;
}
Reference in a new issue Copy permalink