leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ufs_trunc_branch(): separate the calls with non-NULL offsets

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-06-18 16:13:56 -04:00
parent 97e0f8f87c
commit a96574233c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ufs/inode.c
View File

@ -1091,13 +1091,16 @@ static void ufs_trunc_branch(struct inode *inode, unsigned *offsets, int depth2,
} }
if (--depth) { if (--depth) {
if (!--depth2) if (offsets && --depth2) {
offsets = NULL; void *ind = ubh_get_data_ptr(uspi, ubh, from++);
for (i = from ; i < uspi->s_apb ; i++, offsets = NULL) {
void *ind = ubh_get_data_ptr(uspi, ubh, i);
ufs_trunc_branch(inode, offsets, depth2, depth, ind); ufs_trunc_branch(inode, offsets, depth2, depth, ind);
ubh_mark_buffer_dirty(ubh); 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 { } else {
u64 frag_to_free = 0; u64 frag_to_free = 0;
unsigned free_count = 0; unsigned free_count = 0;