BufferAlloc() doesn't allocate write error buffers.

Hiroshi Inoue · Hiroshi Inoue · commit 5f18e2183e46 · 2000-09-29T03:55:45.000Z
Remove compiler waring(my fault).
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.84 2000/09/29 01:23:47 inoue Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.85 2000/09/29 03:55:45 inoue Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -448,6 +448,16 @@ BufferAlloc(Relation reln,
 		{
 			bool		smok;
 
+			/*
+			 *	skip write error buffers 
+			 */
+			if ((buf->flags & BM_IO_ERROR) != 0)
+			{
+				PrivateRefCount[BufferDescriptorGetBuffer(buf) - 1] = 0;
+				buf->refcount--;
+				buf = (BufferDesc *) NULL;
+				continue;
+			}
 			/*
 			 * Set BM_IO_IN_PROGRESS to keep anyone from doing anything
 			 * with the contents of the buffer while we write it out. We
@@ -2529,7 +2539,7 @@ AbortBufferIO(void)
 		else
 		{
 			Assert((buf->flags & BM_DIRTY) != 0);
-			if (buf->flags & BM_IO_ERROR != 0)
+			if ((buf->flags & BM_IO_ERROR) != 0)
 			{
 				elog(NOTICE, "write error may be permanent: cannot write block %u for %s/%s",
 				buf->tag.blockNum, buf->blind.dbname, buf->blind.relname);

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/29 01:23:47 inoue Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.85 2000/09/29 03:55:45 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -448,6 +448,16 @@ BufferAlloc(Relation reln,`
`448`	`448`	`{`
`449`	`449`	`bool smok;`
`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);`