summaryrefslogtreecommitdiffstats
path: root/fs/ufs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-06-18 16:05:18 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-07-06 17:39:42 -0400
commit97e0f8f87c918620689ce542664a3115b752649d (patch)
tree36e273e55397ebe7b11a91041883703ade4aa0e9 /fs/ufs
parent42432739b5902f72011f701f5cd5b4227ebe991c (diff)
downloadlinux-stable-97e0f8f87c918620689ce542664a3115b752649d.tar.gz
linux-stable-97e0f8f87c918620689ce542664a3115b752649d.tar.bz2
linux-stable-97e0f8f87c918620689ce542664a3115b752649d.zip
ufs_trunc_branch(): never call with offsets != NULL && depth2 == 0
For calls in __ufs_truncate_blocks() it's just a matter of not incrementing offsets[0] and not making that call - immediately following loop will be executed one extra time and we'll be just fine. For recursive call in ufs_trunc_branch() itself, just assing NULL to offsets if we would be about to make such call. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/inode.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 285eacd02d60..9e409c12afdf 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -1075,7 +1075,7 @@ static void ufs_trunc_branch(struct inode *inode, unsigned *offsets, int depth2,
struct ufs_inode_info *ufsi = UFS_I(inode);
struct ufs_buffer_head *ubh;
u64 tmp;
- bool free_it = !offsets || !depth2;
+ bool free_it = !offsets;
unsigned from = offsets ? *offsets++ : 0;
unsigned i;
@@ -1091,9 +1091,11 @@ 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);
- ufs_trunc_branch(inode, offsets, depth2 - 1, depth, ind);
+ ufs_trunc_branch(inode, offsets, depth2, depth, ind);
ubh_mark_buffer_dirty(ubh);
}
} else {
@@ -1237,7 +1239,8 @@ static void __ufs_truncate_blocks(struct inode *inode)
ufs_trunc_direct(inode);
offsets[0] = UFS_IND_BLOCK;
} else {
- ufs_trunc_branch(inode, offsets + 1, depth2, depth - 1,
+ if (depth2)
+ ufs_trunc_branch(inode, offsets + 1, depth2, depth - 1,
ufs_get_direct_data_ptr(uspi, ufsi, offsets[0]++));
}
for (i = offsets[0]; i <= UFS_TIND_BLOCK; i++) {