Commit6f6c1a7

committed

Fix EE merge bugs

1 parentb34054b commit6f6c1a7Copy full SHA for 6f6c1a7

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -981,9 +981,6 @@ LruDelete(File file)`
`981`	`981`
`982`	`982`	`vfdP=&VfdCache[file];`
`983`	`983`
`984`		`-/* delete the vfd record from the LRU ring */`
`985`		`-Delete(file);`
`986`		`-`
`987`	`984`	`if (vfdP->fileFlags&PG_COMPRESSION)`
`988`	`985`	`{`
`989`	`986`	`if (cfs_munmap(vfdP->map))`
`@@ -1022,6 +1019,9 @@ LruDelete(File file)`
`1022`	`1019`	`if (close(vfdP->fd))`
`1023`	`1020`	`elog(LOG,"could not close file \"%s\": %m",vfdP->fileName);`
`1024`	`1021`	`vfdP->fd=VFD_CLOSED;`
	`1022`	`+`
	`1023`	`+/* delete the vfd record from the LRU ring */`
	`1024`	`+Delete(file);`
`1025`	`1025`	`}`
`1026`	`1026`
`1027`	`1027`	`staticvoid`
`@@ -1128,7 +1128,6 @@ LruInsert(File file)`
`1128`	`1128`	`vfdP->fileName);`
`1129`	`1129`	`(void)close(vfdP->fd);`
`1130`	`1130`	`vfdP->fd=VFD_CLOSED;`
`1131`		`---nfile;`
`1132`	`1131`	`errno=save_errno;`
`1133`	`1132`	`return-1;`
`1134`	`1133`	`}`
`@@ -2169,9 +2168,7 @@ FileSeek(File file, off_t offset, int whence)`
`2169`	`2168`	`VfdCache[file].seekPos=fileSize-offset;`
`2170`	`2169`	`}`
`2171`	`2170`	`else`
`2172`		`-if (FileAccess(file)<0)`
`2173`		`-return (off_t)-1;`
`2174`		`-vfdP->seekPos=lseek(vfdP->fd,offset,whence);`
	`2171`	`+vfdP->seekPos=lseek(vfdP->fd,offset,whence);`
`2175`	`2172`
`2176`	`2173`	`break;`
`2177`	`2174`	`default:`

Comments

(0)