summaryrefslogtreecommitdiff
path: root/fs/ufs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-06-18 23:13:56 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2015-07-07 00:39:43 +0300
commita96574233c5d2e50736d83abf65161ec5fa55852 (patch)
treeccc9863f01a2dc3028aa60994bd5b09a5b0e8a00 /fs/ufs
parent97e0f8f87c918620689ce542664a3115b752649d (diff)
downloadlinux-a96574233c5d2e50736d83abf65161ec5fa55852.tar.xz
ufs_trunc_branch(): separate the calls with non-NULL offsets
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/inode.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 9e409c12afdf..480c34ee1805 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -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;