2 files changed, 8 insertions, 7 deletions

diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
index 4beb964a2a3e..128d3f7c8aa5 100644
--- a/fs/reiserfs/do_balan.c
+++ b/fs/reiserfs/do_balan.c
@@ -1270,9 +1270,8 @@ static int balance_leaf(struct tree_balance *tb, struct item_head *ih,	/* item h
 
                                         RFALSE(ih, "PAP-12210: ih must be 0");
 
-                                        if (is_direntry_le_ih
-                                            (aux_ih =
-                                             B_N_PITEM_HEAD(tbS0, item_pos))) {
+                                        aux_ih = B_N_PITEM_HEAD(tbS0, item_pos);
+                                        if (is_direntry_le_ih(aux_ih)) {
                                                 /* we append to directory item */
 
                                                 int entry_count;
diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c
index 381750a155f6..03d85cbf90bf 100644
--- a/fs/reiserfs/lbalance.c
+++ b/fs/reiserfs/lbalance.c
@@ -390,7 +390,8 @@ static void leaf_item_bottle(struct buffer_info *dest_bi,
 
         if (last_first == FIRST_TO_LAST) {
                 /* if ( if item in position item_num in buffer SOURCE is directory item ) */
-                if (is_direntry_le_ih(ih = B_N_PITEM_HEAD(src, item_num)))
+                ih = B_N_PITEM_HEAD(src, item_num);
+                if (is_direntry_le_ih(ih))
                         leaf_copy_dir_entries(dest_bi, src, FIRST_TO_LAST,
                                               item_num, 0, cpy_bytes);
                 else {
@@ -418,7 +419,8 @@ static void leaf_item_bottle(struct buffer_info *dest_bi,
                 }
         } else {
                 /*  if ( if item in position item_num in buffer SOURCE is directory item ) */
-                if (is_direntry_le_ih(ih = B_N_PITEM_HEAD(src, item_num)))
+                ih = B_N_PITEM_HEAD(src, item_num);
+                if (is_direntry_le_ih(ih))
                         leaf_copy_dir_entries(dest_bi, src, LAST_TO_FIRST,
                                               item_num,
                                               I_ENTRY_COUNT(ih) - cpy_bytes,
@@ -774,8 +776,8 @@ void leaf_delete_items(struct buffer_info *cur_bi, int last_first,
                         leaf_delete_items_entirely(cur_bi, first + 1,
                                                    del_num - 1);
 
-                        if (is_direntry_le_ih
-                            (ih = B_N_PITEM_HEAD(bh, B_NR_ITEMS(bh) - 1)))
+                        ih = B_N_PITEM_HEAD(bh, B_NR_ITEMS(bh) - 1);
+                        if (is_direntry_le_ih(ih))
                                 /* the last item is directory  */
                                 /* len = numbers of directory entries in this item */
                                 len = ih_entry_count(ih);