Commit5f18e21

Hiroshi Inoue

committed

BufferAlloc() doesn't allocate write error buffers.

Remove compiler waring(my fault).

1 parent77df055 commit5f18e21Copy full SHA for 5f18e21

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.84 2000/09/2901:23:47 inoue Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.85 2000/09/2903:55:45 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -448,6 +448,16 @@ BufferAlloc(Relation reln,`
`448`	`448`	`{`
`449`	`449`	`boolsmok;`
`450`	`450`
	`451`	`+/*`
	`452`	`+ *skip write error buffers`
	`453`	`+ */`
	`454`	`+if ((buf->flags&BM_IO_ERROR)!=0)`
	`455`	`+{`
	`456`	`+PrivateRefCount[BufferDescriptorGetBuffer(buf)-1]=0;`
	`457`	`+buf->refcount--;`
	`458`	`+buf= (BufferDesc*)NULL;`
	`459`	`+continue;`
	`460`	`+}`
`451`	`461`	`/*`
`452`	`462`	`* Set BM_IO_IN_PROGRESS to keep anyone from doing anything`
`453`	`463`	`* with the contents of the buffer while we write it out. We`
`@@ -2529,7 +2539,7 @@ AbortBufferIO(void)`
`2529`	`2539`	`else`
`2530`	`2540`	`{`
`2531`	`2541`	`Assert((buf->flags&BM_DIRTY)!=0);`
`2532`		`-if (buf->flags&BM_IO_ERROR!=0)`
	`2542`	`+if ((buf->flags&BM_IO_ERROR)!=0)`
`2533`	`2543`	`{`
`2534`	`2544`	`elog(NOTICE,"write error may be permanent: cannot write block %u for %s/%s",`
`2535`	`2545`	`buf->tag.blockNum,buf->blind.dbname,buf->blind.relname);`

Comments

(0)