diff options
Diffstat (limited to 'src/backend/storage/buffer/bufmgr.c')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index bdcbe47ac9e..dddb6c0321f 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -1888,7 +1888,7 @@ static void FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln) { XLogRecPtr recptr; - ErrorContextCallback errcontext; + ErrorContextCallback errcallback; instr_time io_start, io_time; @@ -1901,10 +1901,10 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln) return; /* Setup error traceback support for ereport() */ - errcontext.callback = shared_buffer_write_error_callback; - errcontext.arg = (void *) buf; - errcontext.previous = error_context_stack; - error_context_stack = &errcontext; + errcallback.callback = shared_buffer_write_error_callback; + errcallback.arg = (void *) buf; + errcallback.previous = error_context_stack; + error_context_stack = &errcallback; /* Find smgr relation for buffer */ if (reln == NULL) @@ -1967,7 +1967,7 @@ FlushBuffer(volatile BufferDesc *buf, SMgrRelation reln) reln->smgr_rnode.node.relNode); /* Pop the error context stack */ - error_context_stack = errcontext.previous; + error_context_stack = errcallback.previous; } /* @@ -2253,13 +2253,13 @@ FlushRelationBuffers(Relation rel) if (RelFileNodeEquals(bufHdr->tag.rnode, rel->rd_node) && (bufHdr->flags & BM_VALID) && (bufHdr->flags & BM_DIRTY)) { - ErrorContextCallback errcontext; + ErrorContextCallback errcallback; /* Setup error traceback support for ereport() */ - errcontext.callback = local_buffer_write_error_callback; - errcontext.arg = (void *) bufHdr; - errcontext.previous = error_context_stack; - error_context_stack = &errcontext; + errcallback.callback = local_buffer_write_error_callback; + errcallback.arg = (void *) bufHdr; + errcallback.previous = error_context_stack; + error_context_stack = &errcallback; smgrwrite(rel->rd_smgr, bufHdr->tag.forkNum, @@ -2270,7 +2270,7 @@ FlushRelationBuffers(Relation rel) bufHdr->flags &= ~(BM_DIRTY | BM_JUST_DIRTIED); /* Pop the error context stack */ - error_context_stack = errcontext.previous; + error_context_stack = errcallback.previous; } } |