Module Name: src
Committed By: reinoud
Date: Wed Sep 17 21:18:43 UTC 2014
Modified Files:
src/sys/fs/udf: udf_subr.c
Log Message:
Fix bug introduced in last patch
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.126 src/sys/fs/udf/udf_subr.c:1.127
--- src/sys/fs/udf/udf_subr.c:1.126 Wed Sep 17 19:47:05 2014
+++ src/sys/fs/udf/udf_subr.c Wed Sep 17 21:18:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.127 2014/09/17 21:18:43 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.126 2014/09/17 19:47:05 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.127 2014/09/17 21:18:43 reinoud Exp $");
#endif /* not lint */
@@ -5285,7 +5285,7 @@ udf_get_node(struct udf_mount *ump, stru
union dscrptr *dscr;
struct udf_node *udf_node;
struct vnode *nvp;
- struct long_ad icb_loc, last_fe_icb_loc;
+ struct long_ad icb_loc, next_icb_loc, last_fe_icb_loc;
uint64_t file_size;
uint32_t lb_size, sector, dummy;
int udf_file_type, dscr_type, strat, strat4096, needs_indirect;
@@ -5393,8 +5393,9 @@ udf_get_node(struct udf_mount *ump, stru
/* if dealing with an indirect entry, follow the link */
if (dscr_type == TAGID_INDIRECTENTRY) {
needs_indirect = 0;
- icb_loc = dscr->inde.indirect_icb;
+ next_icb_loc = dscr->inde.indirect_icb;
udf_free_logvol_dscr(ump, &icb_loc, dscr);
+ icb_loc = next_icb_loc;
if (++num_indir_followed > UDF_MAX_INDIRS_FOLLOW) {
error = EMLINK;
break;
