summaryrefslogtreecommitdiffstats
path: root/fs/ufs/inode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-06-18 17:23:34 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-07-06 17:39:46 -0400
commit6aab6dd37946d0d592105872bd533bb7d2931f3f (patch)
tree4f70e41310abcaa6db31885599fabdaa8951dbf1 /fs/ufs/inode.c
parent6d1ebbca2b2fe516ff5f279848cffbd23d2b0270 (diff)
downloadlinux-6aab6dd37946d0d592105872bd533bb7d2931f3f.tar.bz2
ufs_trunc_branch(): massage towards killing recursion
We always have 0 < depth2 <= depth in there, so if (--depth) { if (--depth2) A B } else { C // not using depth2 } D // not using depth2 is equivalent to if (--depth2) A with s/depth/depth - 1/ if (--depth) B else C D Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ufs/inode.c')
-rw-r--r--fs/ufs/inode.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index c06556558c9b..dac81c318da7 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -1145,12 +1145,12 @@ static void ufs_trunc_branch(struct inode *inode, unsigned *offsets, int depth2,
return;
}
+ if (--depth2) {
+ void *ind = ubh_get_data_ptr(uspi, ubh, from++);
+ ufs_trunc_branch(inode, offsets, depth2, depth - 1, ind);
+ ubh_mark_buffer_dirty(ubh);
+ }
if (--depth) {
- if (--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);
free_full_branch(inode, depth, ind);