forked from Minki/linux
ufs_trunc_branch(): separate the calls with non-NULL offsets
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
97e0f8f87c
commit
a96574233c
@ -1091,13 +1091,16 @@ static void ufs_trunc_branch(struct inode *inode, unsigned *offsets, int depth2,
|
||||
}
|
||||
|
||||
if (--depth) {
|
||||
if (!--depth2)
|
||||
offsets = NULL;
|
||||
for (i = from ; i < uspi->s_apb ; i++, offsets = NULL) {
|
||||
void *ind = ubh_get_data_ptr(uspi, ubh, i);
|
||||
if (offsets && --depth2) {
|
||||
void *ind = ubh_get_data_ptr(uspi, ubh, from++);
|
||||
ufs_trunc_branch(inode, offsets, depth2, depth, ind);
|
||||
ubh_mark_buffer_dirty(ubh);
|
||||
}
|
||||
for (i = from ; i < uspi->s_apb ; i++) {
|
||||
void *ind = ubh_get_data_ptr(uspi, ubh, i);
|
||||
ufs_trunc_branch(inode, NULL, 0, depth, ind);
|
||||
ubh_mark_buffer_dirty(ubh);
|
||||
}
|
||||
} else {
|
||||
u64 frag_to_free = 0;
|
||||
unsigned free_count = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user