From 03d5db37cafa1ddf36b510978249cabc102eb0a0 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sun, 18 Dec 2016 06:20:35 +0900 Subject: [PATCH] Revert "sbin/hammer: Fix bug in get_buffer_data()" This reverts commit e4323571a2e8310683120148b720a92f801c618f. HAMMER_OFF_LONG_ENCODE() part is ok, but limiting to direct zones causes several issues on formatting undo fifo, while the commit avoids overhead of releasing everytime. --- sbin/hammer/ondisk.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c index 3e1d186089..0b34c7e33d 100644 --- a/sbin/hammer/ondisk.c +++ b/sbin/hammer/ondisk.c @@ -427,13 +427,10 @@ get_buffer_data(hammer_off_t buf_offset, struct buffer_info **bufferp, hammer_off_t xor; if (*bufferp != NULL) { - if (hammer_is_zone_direct_xlated(buf_offset)) { - xor = HAMMER_OFF_LONG_ENCODE(buf_offset) ^ - HAMMER_OFF_LONG_ENCODE((*bufferp)->zone2_offset); - if (isnew > 0 || (xor & ~HAMMER_BUFMASK64)) { - rel_buffer(*bufferp); - *bufferp = NULL; - } + xor = (*bufferp)->zone2_offset ^ buf_offset; + if (isnew > 0 || (xor & ~HAMMER_BUFMASK64)) { + rel_buffer(*bufferp); + *bufferp = NULL; } } -- 2.11.4.GIT