git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: defconfig: update
[pandora-kernel.git]
/
fs
/
ext4
/
resize.c
diff --git
a/fs/ext4/resize.c
b/fs/ext4/resize.c
index
996780a
..
9e9e67b
100644
(file)
--- a/
fs/ext4/resize.c
+++ b/
fs/ext4/resize.c
@@
-142,7
+142,7
@@
static struct buffer_head *bclean(handle_t *handle, struct super_block *sb,
bh = sb_getblk(sb, blk);
if (!bh)
bh = sb_getblk(sb, blk);
if (!bh)
- return ERR_PTR(-E
IO
);
+ return ERR_PTR(-E
NOMEM
);
if ((err = ext4_journal_get_write_access(handle, bh))) {
brelse(bh);
bh = ERR_PTR(err);
if ((err = ext4_journal_get_write_access(handle, bh))) {
brelse(bh);
bh = ERR_PTR(err);
@@
-220,7
+220,7
@@
static int setup_new_group_blocks(struct super_block *sb,
gdb = sb_getblk(sb, block);
if (!gdb) {
gdb = sb_getblk(sb, block);
if (!gdb) {
- err = -E
IO
;
+ err = -E
NOMEM
;
goto exit_journal;
}
if ((err = ext4_journal_get_write_access(handle, gdb))) {
goto exit_journal;
}
if ((err = ext4_journal_get_write_access(handle, gdb))) {
@@
-692,9
+692,9
@@
static void update_backups(struct super_block *sb,
(err = ext4_journal_restart(handle, EXT4_MAX_TRANS_DATA)))
break;
(err = ext4_journal_restart(handle, EXT4_MAX_TRANS_DATA)))
break;
- bh = sb_getblk(sb, group * bpg + blk_off);
+ bh = sb_getblk(sb,
(ext4_fsblk_t)
group * bpg + blk_off);
if (!bh) {
if (!bh) {
- err = -E
IO
;
+ err = -E
NOMEM
;
break;
}
ext4_debug("update metadata backup %#04lx\n",
break;
}
ext4_debug("update metadata backup %#04lx\n",
@@
-938,7
+938,7
@@
int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
/* Update the free space counts */
percpu_counter_add(&sbi->s_freeclusters_counter,
/* Update the free space counts */
percpu_counter_add(&sbi->s_freeclusters_counter,
- EXT4_B2C(sbi, input->free_blocks_count));
+ EXT4_
NUM_
B2C(sbi, input->free_blocks_count));
percpu_counter_add(&sbi->s_freeinodes_counter,
EXT4_INODES_PER_GROUP(sb));
percpu_counter_add(&sbi->s_freeinodes_counter,
EXT4_INODES_PER_GROUP(sb));
@@
-946,12
+946,17
@@
int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
sbi->s_log_groups_per_flex) {
ext4_group_t flex_group;
flex_group = ext4_flex_group(sbi, input->group);
sbi->s_log_groups_per_flex) {
ext4_group_t flex_group;
flex_group = ext4_flex_group(sbi, input->group);
- atomic
_add(EXT4
_B2C(sbi, input->free_blocks_count),
- &sbi->s_flex_groups[flex_group].free_clusters);
+ atomic
64_add(EXT4_NUM
_B2C(sbi, input->free_blocks_count),
+
&sbi->s_flex_groups[flex_group].free_clusters);
atomic_add(EXT4_INODES_PER_GROUP(sb),
&sbi->s_flex_groups[flex_group].free_inodes);
}
atomic_add(EXT4_INODES_PER_GROUP(sb),
&sbi->s_flex_groups[flex_group].free_inodes);
}
+ /*
+ * Update the fs overhead information
+ */
+ ext4_calculate_overhead(sb);
+
ext4_handle_dirty_super(handle, sb);
exit_journal:
ext4_handle_dirty_super(handle, sb);
exit_journal: