summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngkaho1234 <ngkaho1234@gmail.com>2015-11-10 04:07:50 +0000
committerngkaho1234 <ngkaho1234@gmail.com>2015-11-10 04:25:28 +0000
commitef71d9b49afe0b095a7f601bb23557588c9946ec (patch)
tree38814eace619898ccf2a318734efea164bca510d
parente3b6a36302245cd76cb9f7d7dab371c737f8b7c6 (diff)
Replace ext4_block_get with ext4_block_get_noread:
ext4_dir, ext4_dir_idx, ext4_extent, ext4_fs
-rw-r--r--lwext4/ext4_dir.c2
-rw-r--r--lwext4/ext4_dir_idx.c11
-rw-r--r--lwext4/ext4_extent.c4
-rw-r--r--lwext4/ext4_fs.c11
4 files changed, 15 insertions, 13 deletions
diff --git a/lwext4/ext4_dir.c b/lwext4/ext4_dir.c
index 55a4aa5..b107776 100644
--- a/lwext4/ext4_dir.c
+++ b/lwext4/ext4_dir.c
@@ -418,7 +418,7 @@ int ext4_dir_add_entry(struct ext4_inode_ref *parent, const char *name,
/* Load new block */
struct ext4_block new_block;
- rc = ext4_block_get(fs->bdev, &new_block, fblock);
+ rc = ext4_block_get_noread(fs->bdev, &new_block, fblock);
if (rc != EOK)
return rc;
diff --git a/lwext4/ext4_dir_idx.c b/lwext4/ext4_dir_idx.c
index ea2a507..df1d999 100644
--- a/lwext4/ext4_dir_idx.c
+++ b/lwext4/ext4_dir_idx.c
@@ -361,7 +361,7 @@ int ext4_dir_dx_init(struct ext4_inode_ref *dir, struct ext4_inode_ref *parent)
return rc;
struct ext4_block block;
- rc = ext4_block_get(dir->fs->bdev, &block, fblock);
+ rc = ext4_block_get_noread(dir->fs->bdev, &block, fblock);
if (rc != EOK)
return rc;
@@ -418,7 +418,7 @@ int ext4_dir_dx_init(struct ext4_inode_ref *dir, struct ext4_inode_ref *parent)
struct ext4_block new_block;
- rc = ext4_block_get(dir->fs->bdev, &new_block, fblock);
+ rc = ext4_block_get_noread(dir->fs->bdev, &new_block, fblock);
if (rc != EOK) {
ext4_block_set(dir->fs->bdev, &block);
return rc;
@@ -1043,8 +1043,8 @@ static int ext4_dir_dx_split_data(struct ext4_inode_ref *inode_ref,
/* Load new block */
struct ext4_block new_data_block_tmp;
- rc = ext4_block_get(inode_ref->fs->bdev, &new_data_block_tmp,
- new_fblock);
+ rc = ext4_block_get_noread(inode_ref->fs->bdev, &new_data_block_tmp,
+ new_fblock);
if (rc != EOK) {
free(sort_array);
free(entry_buffer);
@@ -1202,7 +1202,8 @@ ext4_dir_dx_split_index(struct ext4_inode_ref *inode_ref,
/* load new block */
struct ext4_block new_block;
rc =
- ext4_block_get(inode_ref->fs->bdev, &new_block, new_fblock);
+ ext4_block_get_noread(inode_ref->fs->bdev,
+ &new_block, new_fblock);
if (rc != EOK)
return rc;
diff --git a/lwext4/ext4_extent.c b/lwext4/ext4_extent.c
index 3f4c370..e5ec5f8 100644
--- a/lwext4/ext4_extent.c
+++ b/lwext4/ext4_extent.c
@@ -651,7 +651,7 @@ static int ext4_extent_append_extent(struct ext4_inode_ref *inode_ref,
struct ext4_block block;
rc =
- ext4_block_get(inode_ref->fs->bdev, &block, fblock);
+ ext4_block_get_noread(inode_ref->fs->bdev, &block, fblock);
if (rc != EOK) {
ext4_balloc_free_block(inode_ref, fblock);
return rc;
@@ -755,7 +755,7 @@ static int ext4_extent_append_extent(struct ext4_inode_ref *inode_ref,
return rc;
struct ext4_block block;
- rc = ext4_block_get(inode_ref->fs->bdev, &block, new_fblock);
+ rc = ext4_block_get_noread(inode_ref->fs->bdev, &block, new_fblock);
if (rc != EOK)
return rc;
diff --git a/lwext4/ext4_fs.c b/lwext4/ext4_fs.c
index c1bc25f..ac606c3 100644
--- a/lwext4/ext4_fs.c
+++ b/lwext4/ext4_fs.c
@@ -306,7 +306,7 @@ static int ext4_fs_init_block_bitmap(struct ext4_block_group_ref *bg_ref)
struct ext4_block block_bitmap;
int rc =
- ext4_block_get(bg_ref->fs->bdev, &block_bitmap, bitmap_block_addr);
+ ext4_block_get_noread(bg_ref->fs->bdev, &block_bitmap, bitmap_block_addr);
if (rc != EOK)
return rc;
@@ -393,7 +393,8 @@ static int ext4_fs_init_inode_bitmap(struct ext4_block_group_ref *bg_ref)
struct ext4_block block_bitmap;
int rc =
- ext4_block_get(bg_ref->fs->bdev, &block_bitmap, bitmap_block_addr);
+ ext4_block_get_noread(bg_ref->fs->bdev,
+ &block_bitmap, bitmap_block_addr);
if (rc != EOK)
return rc;
@@ -453,7 +454,7 @@ static int ext4_fs_init_inode_table(struct ext4_block_group_ref *bg_ref)
for (fblock = first_block; fblock <= last_block; ++fblock) {
struct ext4_block block;
- int rc = ext4_block_get(bg_ref->fs->bdev, &block, fblock);
+ int rc = ext4_block_get_noread(bg_ref->fs->bdev, &block, fblock);
if (rc != EOK)
return rc;
@@ -1543,7 +1544,7 @@ static int ext4_fs_set_inode_data_block_index(struct ext4_inode_ref *inode_ref,
inode_ref->dirty = true;
/* Load newly allocated block */
- rc = ext4_block_get(fs->bdev, &new_block, new_block_addr);
+ rc = ext4_block_get_noread(fs->bdev, &new_block, new_block_addr);
if (rc != EOK) {
ext4_balloc_free_block(inode_ref, new_block_addr);
return rc;
@@ -1590,7 +1591,7 @@ static int ext4_fs_set_inode_data_block_index(struct ext4_inode_ref *inode_ref,
}
/* Load newly allocated block */
- rc = ext4_block_get(fs->bdev, &new_block,
+ rc = ext4_block_get_noread(fs->bdev, &new_block,
new_block_addr);
if (rc != EOK) {