]> git.hungrycats.org Git - linux/commitdiff
[PATCH] reiserfs vs-8115 test adjustment
authorOleg Drokin <green@linuxhacker.ru>
Tue, 11 Jan 2005 01:15:02 +0000 (17:15 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 11 Jan 2005 01:15:02 +0000 (17:15 -0800)
This patch below is needed to suppress the warning, with more than one
indirect block insertion at a time, it is now possible to split indirect
items as well and there were reports on lkml from people who seen this
warning and were worried about it.

To be on the safe side, I consulted with Vladimir Saveliev and he said that
the change is safe to do indeed.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/reiserfs/fix_node.c

index 1bffb65798b710d022068b3e8fded31385357c69..e4f64be9e15b50dd7b22a00428b4c0cba5cf168b 100644 (file)
@@ -510,9 +510,10 @@ static int get_num_ver (int mode, struct tree_balance * tb, int h,
        // s2bytes
        snum012[4] = op_unit_num (&vn->vn_vi[split_item_num]) - snum012[4] - bytes_to_r - bytes_to_l - bytes_to_S1new;
 
-       if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY)
+       if (vn->vn_vi[split_item_num].vi_index != TYPE_DIRENTRY &&
+           vn->vn_vi[split_item_num].vi_index != TYPE_INDIRECT)
            reiserfs_warning (tb->tb_sb, "vs-8115: get_num_ver: not "
-                             "directory item");
+                             "directory or indirect item");
     }
 
     /* now we know S2bytes, calculate S1bytes */