ntfs-3g_apply.c: fix inode reuse

NTFS inodes were not being reused as intended following commit 26a90546f2
("ntfs-3g_apply.c: Do not use i_visited").

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index a6c50c2f7e08984e4bc69609fae021ab3fef8ee7..dc61e4779cc2aa1fc05db15a47b1cd1461f9b91c 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -795,8 +795,7 @@ ntfs_3g_open_inode(struct wim_inode *inode, struct ntfs_3g_apply_ctx *ctx)
        if (unlikely(inode->i_num_streams > 1)) {
                for (unsigned i = 0; i < ctx->num_open_inodes; i++) {
                        if (ctx->open_inodes[i]->mft_no == inode->i_mft_no) {
        if (unlikely(inode->i_num_streams > 1)) {
                for (unsigned i = 0; i < ctx->num_open_inodes; i++) {
                        if (ctx->open_inodes[i]->mft_no == inode->i_mft_no) {

-                               ni = ctx->open_inodes[i];
-                               goto have_inode;
+                               return ctx->open_inodes[i];

                        }
                }
        }
                        }
                }
        }


@@ -809,7 +808,6 @@ ntfs_3g_open_inode(struct wim_inode *inode, struct ntfs_3g_apply_ctx *ctx)
                return NULL;
        }
 
                return NULL;
        }
 

-have_inode:

        ctx->open_inodes[ctx->num_open_inodes++] = ni;
        return ni;
 }
        ctx->open_inodes[ctx->num_open_inodes++] = ni;
        return ni;
 }