Fix reiserfs symlink resolution

* Fix reiserfs symlink resolution which could fail in certain circumstances.

git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-23

diff --git a/0arch-timestamps0 b/0arch-timestamps0
index d8cf2581fbbb56d9030269b57f019c23ce3fdc3f..dd73cc430414d1719dbd4385d29a3e2dc2588c06 100644 (file)
--- a/0arch-timestamps0
+++ b/0arch-timestamps0
@@ -1,8 +1,8 @@
 ./include/xfs/.arch-ids/=id    1020517215      1017069090
 ./include/xfs/.arch-ids/xfs.h.id       1020517215      1017069096
-./include/xfs/.arch-ids        1022662153      1017069096
+./include/xfs/.arch-ids        1025684125      1017069096
 ./include/xfs/xfs.h    1020517215      1002101334
-./include/xfs  1022662153      1007269244
+./include/xfs  1025684125      1007269244
 ./include/.arch-ids/errors.h.id        1020517214      1017069108
 ./include/.arch-ids/=id        1020517213      1017027153
 ./include/.arch-ids/bootinfo.h.id      1020517213      1017027154
@@ -25,50 +25,50 @@
 ./include/.arch-ids/types.h.id 1020517214      1017027162
 ./include/.arch-ids/yaboot.h.id        1020517214      1017027162
 ./include/.arch-ids/debug.h.id 1020517214      1017154770
-./include/.arch-ids    1022662153      1017154770
+./include/.arch-ids    1025684125      1017154770
 ./include/asm/.arch-ids/=id    1020517214      1017027153
 ./include/asm/.arch-ids/elf.h.id       1020517214      1017027153
 ./include/asm/.arch-ids/ppc_asm.tmpl.id        1020517214      1017027153
 ./include/asm/.arch-ids/processor.h.id 1020517214      1017027154
-./include/asm/.arch-ids        1022662153      1017027154
+./include/asm/.arch-ids        1025684125      1017027154
 ./include/asm/elf.h    1020517214      1000991730
 ./include/asm/ppc_asm.tmpl     1020517214      1000991730
 ./include/asm/processor.h      1020517214      1000991730
-./include/asm  1022662153      1007269243
+./include/asm  1025684125      1007269243
 ./include/et/.arch-ids/=id     1020517214      1017027155
 ./include/et/.arch-ids/com_err.h.id    1020517214      1017027155
-./include/et/.arch-ids 1022662153      1017155400
+./include/et/.arch-ids 1025684125      1017155400
 ./include/et/com_err.h 1020517214      1000991731
-./include/et   1022662153      1007269243
+./include/et   1025684125      1007269243
 ./include/ext2fs/.arch-ids/=id 1020517214      1017027156
 ./include/ext2fs/.arch-ids/bitops.h.id 1020517214      1017027156
 ./include/ext2fs/.arch-ids/ext2_err.h.id       1020517214      1017027156
 ./include/ext2fs/.arch-ids/ext2_io.h.id        1020517214      1017027156
 ./include/ext2fs/.arch-ids/ext2fs.h.id 1020517214      1017027156
-./include/ext2fs/.arch-ids     1022662153      1017027156
+./include/ext2fs/.arch-ids     1025684125      1017027156
 ./include/ext2fs/bitops.h      1020517214      1003927524
 ./include/ext2fs/ext2_err.h    1020517214      1003927524
 ./include/ext2fs/ext2_io.h     1020517215      1003927524
 ./include/ext2fs/ext2fs.h      1020517215      1003927524
-./include/ext2fs       1022662153      1007269243
+./include/ext2fs       1025684125      1007269243
 ./include/linux/.arch-ids/=id  1020517215      1017027157
 ./include/linux/.arch-ids/elf.h.id     1020517215      1017027158
 ./include/linux/.arch-ids/ext2_fs.h.id 1020517215      1017027158
 ./include/linux/.arch-ids/iso_fs.h.id  1020517215      1017027158
 ./include/linux/.arch-ids/stat.h.id    1020517215      1017027158
 ./include/linux/.arch-ids/types.h.id   1020517215      1017027159
-./include/linux/.arch-ids      1022662153      1017027159
+./include/linux/.arch-ids      1025684125      1017027159
 ./include/linux/elf.h  1020517215      1000991731
 ./include/linux/ext2_fs.h      1020517215      1000991731
 ./include/linux/iso_fs.h       1020517215      1000991731
 ./include/linux/stat.h 1020517215      1000991731
 ./include/linux/types.h        1020517215      1000991731
-./include/linux        1022662153      1007269243
+./include/linux        1025684125      1007269243
 ./include/reiserfs/.arch-ids/=id       1020517215      1017027160
 ./include/reiserfs/.arch-ids/reiserfs.h.id     1020517215      1017027160
-./include/reiserfs/.arch-ids   1022662153      1017027160
-./include/reiserfs/reiserfs.h  1020517215      1000991731
-./include/reiserfs     1022662153      1007269244
+./include/reiserfs/.arch-ids   1025684125      1017027160
+./include/reiserfs/reiserfs.h  1025684115      1025684115
+./include/reiserfs     1025684125      1025684115
 ./include/errors.h     1020517214      1007200690
 ./include/bootinfo.h   1020517214      1007200690
 ./include/byteorder.h  1020517214      1000991730
@@ -90,7 +90,7 @@
 ./include/types.h      1020517215      1000991730
 ./include/yaboot.h     1020517215      1007200690
 ./include/debug.h      1020517214      1007200690
-./include      1022662153      1007269244
+./include      1025684125      1007269244
 ./second/.arch-ids/fs_xfs.c.id 1020517216      1017069120
 ./second/.arch-ids/=id 1020517216      1017027166
 ./second/.arch-ids/cache.S.id  1020517216      1017027167
@@ -109,7 +109,7 @@
 ./second/.arch-ids/prom.c.id   1020517216      1017027170
 ./second/.arch-ids/setjmp.S.id 1020517216      1017027171
 ./second/.arch-ids/yaboot.c.id 1020517216      1017027171
-./second/.arch-ids     1022662153      1017069120
+./second/.arch-ids     1025684125      1017069120
 ./second/fs_xfs.c      1020517217      1007200690
 ./second/cache.S       1020517216      1007200690
 ./second/cfg.c 1020517216      1007200690
@@ -127,8 +127,9 @@
 ./second/prom.c        1020668668      1007200690
 ./second/setjmp.S      1020517217      1000991732
 ./second/yaboot.c      1021794202      1007200690
-./second       1022662153      1017829091
+./second       1025684125      1017829091
 ./.arch-ids/Config.id  1020517212      1017069133
+./.arch-ids/0arch-timestamps0.id       1020517208      1020516949
 ./.arch-ids/ChangeLog.id       1020517212      1017026820
 ./.arch-ids/BUGS.id    1020517212      1017027147
 ./.arch-ids/COPYING.id 1020517212      1017027147
@@ -140,8 +141,7 @@
 ./.arch-ids/TODO.id    1020517212      1017027149
 ./.arch-ids/changelog.id       1020517212      1017027149
 ./.arch-ids/man.patch.id       1020517212      1017027166
-./.arch-ids/0arch-timestamps0.id       1020517208      1020516949
-./.arch-ids    1022662153      1020516949
+./.arch-ids    1025684125      1020516949
 ./doc/.arch-ids/=id    1020517213      1017027149
 ./doc/.arch-ids/README.ofboot.id       1020517213      1017027149
 ./doc/.arch-ids/README.ofpath.id       1020517213      1017027149
@@ -149,7 +149,7 @@
 ./doc/.arch-ids/Makefile.id    1020517213      1017235762
 ./doc/.arch-ids/yaboot-howto.sgml.id   1020517213      1017235765
 ./doc/.arch-ids/yaboot-howto.de.sgml.id        1020517213      1017238100
-./doc/.arch-ids        1022662153      1017238100
+./doc/.arch-ids        1025684125      1017238100
 ./doc/examples/.arch-ids/=id   1020517213      1017027150
 ./doc/examples/.arch-ids/README.dualboot.chrp.id       1020517213      1017027150
 ./doc/examples/.arch-ids/README.mbicons.id     1020517213      1017027150
@@ -159,7 +159,7 @@
 ./doc/examples/.arch-ids/simpleboot.chrp.id    1020517213      1017027151
 ./doc/examples/.arch-ids/yaboot.conf.multi-boot.id     1020517213      1017027151
 ./doc/examples/.arch-ids/yaboot.conf.rs6000.id 1020517213      1017027152
-./doc/examples/.arch-ids       1022662153      1017236175
+./doc/examples/.arch-ids       1025684125      1017236175
 ./doc/examples/README.dualboot.chrp    1020517213      1000991730
 ./doc/examples/README.mbicons  1020517213      1000991730
 ./doc/examples/README.simpleboot.chrp  1020517213      1000991730
@@ -168,24 +168,24 @@
 ./doc/examples/simpleboot.chrp 1020517213      1006347336
 ./doc/examples/yaboot.conf.multi-boot  1020517213      1006348765
 ./doc/examples/yaboot.conf.rs6000      1020517213      1006348765
-./doc/examples 1022662153      1007269243
+./doc/examples 1025684125      1007269243
 ./doc/README.ofboot    1020517213      1000991730
 ./doc/README.ofpath    1020517213      1000991730
 ./doc/README.rs6000    1020517213      1007200689
 ./doc/Makefile 1020517213      1019310768
 ./doc/yaboot-howto.sgml        1020517213      1019310768
 ./doc/yaboot-howto.de.sgml     1020517213      1019310778
-./doc  1022662153      1007269248
+./doc  1025684125      1007269248
 ./etc/.arch-ids/=id    1020517213      1017027152
 ./etc/.arch-ids/yaboot.conf.id 1020517213      1017027152
-./etc/.arch-ids        1022662153      1017027152
+./etc/.arch-ids        1025684125      1017027152
 ./etc/yaboot.conf      1020517213      1006348765
-./etc  1022662153      1007269243
+./etc  1025684125      1007269243
 ./first/.arch-ids/=id  1020517213      1017027152
 ./first/.arch-ids/ofboot.id    1020517213      1017027152
-./first/.arch-ids      1022662153      1017027152
+./first/.arch-ids      1025684125      1017027152
 ./first/ofboot 1020517213      1001425099
-./first        1022662153      1007269243
+./first        1025684125      1007269243
 ./lib/.arch-ids/=id    1020517215      1017027162
 ./lib/.arch-ids/ctype.c.id     1020517215      1017027163
 ./lib/.arch-ids/libext2fs.a.id 1020517215      1017027163
@@ -195,7 +195,7 @@
 ./lib/.arch-ids/strstr.c.id    1020517215      1017027164
 ./lib/.arch-ids/strtol.c.id    1020517215      1017027164
 ./lib/.arch-ids/vsprintf.c.id  1020517215      1017027164
-./lib/.arch-ids        1022662153      1017027164
+./lib/.arch-ids        1025684125      1017027164
 ./lib/ctype.c  1022570909      1000991731
 ./lib/libext2fs.a      1020517216      1003927524
 ./lib/malloc.c 1020517216      1007200690
@@ -204,7 +204,7 @@
 ./lib/strstr.c 1020517216      1000991731
 ./lib/strtol.c 1020517216      1000991731
 ./lib/vsprintf.c       1020517216      1000991731
-./lib  1022662153      1014816709
+./lib  1025684125      1014816709
 ./man/.arch-ids/=id    1020517216      1017027164
 ./man/.arch-ids/bootstrap.8.id 1020517216      1017027165
 ./man/.arch-ids/mkofboot.8.id  1020517216      1017027165
@@ -213,7 +213,7 @@
 ./man/.arch-ids/yaboot.conf.5.id       1020517216      1017027166
 ./man/.arch-ids/yabootconfig.8.id      1020517216      1017027166
 ./man/.arch-ids/ybin.8.id      1020517216      1017027166
-./man/.arch-ids        1022662153      1017027166
+./man/.arch-ids        1025684125      1017027166
 ./man/bootstrap.8      1020517216      1000991731
 ./man/mkofboot.8       1020517216      1006348765
 ./man/ofpath.8 1020517216      1000991731
@@ -221,26 +221,27 @@
 ./man/yaboot.conf.5    1020517216      1004256691
 ./man/yabootconfig.8   1020517216      1006652701
 ./man/ybin.8   1020517216      1006348765
-./man  1022662153      1007269257
+./man  1025684125      1007269257
 ./util/.arch-ids/=id   1020517217      1017027171
 ./util/.arch-ids/addnote.c.id  1020517217      1017027171
 ./util/.arch-ids/elfextract.c.id       1020517217      1017027172
-./util/.arch-ids       1022662153      1017027172
+./util/.arch-ids       1025684125      1017027172
 ./util/addnote.c       1020517217      1007200691
 ./util/elfextract.c    1020517217      1007303237
-./util 1022662153      1014816709
+./util 1025684125      1014816709
 ./ybin/.arch-ids/=id   1020517217      1017027172
 ./ybin/.arch-ids/mkofboot.id   1020517217      1017027172
 ./ybin/.arch-ids/ofpath.id     1020517217      1017027172
 ./ybin/.arch-ids/yabootconfig.id       1020517217      1017027172
 ./ybin/.arch-ids/ybin.id       1020517217      1017027173
-./ybin/.arch-ids       1022662154      1017027173
-./ybin/mkofboot        1020517217      1020516866
+./ybin/.arch-ids       1025684125      1017027173
+./ybin/mkofboot        1025684107      1025684084
 ./ybin/ofpath  1020945900      1000991732
 ./ybin/yabootconfig    1020517217      1006347337
 ./ybin/ybin    1020517217      1017027116
-./ybin 1022662153      1014816705
+./ybin 1025684125      1014816705
 ./Config       1020517212      1002101497
+./0arch-timestamps0    1025684107      1025684125
 ./ChangeLog    1020581653      1020517225
 ./BUGS 1020517212      1000991730
 ./COPYING      1022659487      1000991730
@@ -252,5 +253,4 @@
 ./TODO 1020517213      1006527567
 ./changelog    1020517213      1007269216
 ./man.patch    1020517216      1006348761
-./0arch-timestamps0    1020518635      1022662154
-.      1022662153      1020517250
+.      1025684125      1020517250

diff --git a/ChangeLog b/ChangeLog
index 289079c82ee8c1ef96efe5aa5781d95e85170687..cefdf2ff269f4196c5b9d593986667a458d7dff3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
 # tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3
 #
 
+2002-07-03 08:17:12 GMT        Ethan Benson <erbenson@alaska.net>      patch-23
+
+    Summary:
+      Fix reiserfs symlink resolution
+    Revision:
+      yaboot--devel--1.3--patch-23
+
+    * Fix reiserfs symlink resolution which could fail in certain circumstances.
+    
+    
+
+    modified files:
+     0arch-timestamps0 ChangeLog include/reiserfs/reiserfs.h
+
+
 2002-05-29 08:50:39 GMT        Ethan Benson <erbenson@alaska.net>      patch-22
 
     Summary:

diff --git a/include/reiserfs/reiserfs.h b/include/reiserfs/reiserfs.h
index 2e27a27e3ab47866fc0f4d850e883c79057913b9..822f85c26b991104a7c3fb08933ac682e095a291 100644 (file)
--- a/include/reiserfs/reiserfs.h
+++ b/include/reiserfs/reiserfs.h
@@ -95,14 +95,14 @@ struct reiserfs_journal_header {
 /* Item version determines which offset_v# struct to use */
 #define ITEM_VERSION_1 0
 #define ITEM_VERSION_2 1
-#define IH_KEY_OFFSET(ih) (INFO->version < 2 \
-                           || ih_version(ih) == ITEM_VERSION_1 \
-                           ? (ih)->ih_key.u.k_offset_v1.k_offset \
+#define IH_KEY_OFFSET(ih) ((INFO->version < 2 \
+                           || ih_version(ih) == ITEM_VERSION_1) \
+                           ? le32_to_cpu ((ih)->ih_key.u.k_offset_v1.k_offset) \
                            : offset_v2_k_offset(&(ih)->ih_key.u.k_offset_v2))
  
-#define IH_KEY_ISTYPE(ih, type) (INFO->version < 2 \
-                || ih_version(ih) == ITEM_VERSION_1 \
-                ? (ih)->ih_key.u.k_offset_v1.k_uniqueness == V1_##type \
+#define IH_KEY_ISTYPE(ih, type) ((INFO->version < 2 \
+                || ih_version(ih) == ITEM_VERSION_1) \
+                ? le32_to_cpu((ih)->ih_key.u.k_offset_v1.k_uniqueness) == V1_##type \
                 : offset_v2_k_type(&(ih)->ih_key.u.k_offset_v2) == V2_##type)
 
 //