[packages/db4.4.git] / patch.4.4.20.1

*** qam/qam_files.c.orig	2005-10-20 11:57:12.000000000 -0700
--- qam/qam_files.c	2006-01-27 13:38:38.000000000 -0800
***************
*** 411,416 ****
--- 411,422 ----
  	    DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
  		goto err;
  #endif
+ 
+ 	mpf = array->mpfarray[offset].mpf;
+ 	/* This extent my already be marked for delete and closed. */
+ 	if (mpf == NULL)
+ 		goto err;
+ 
  	/*
  	 * The log must be flushed before the file is deleted.  We depend on
  	 * the log record of the last delete to recreate the file if we crash.
***************
*** 418,424 ****
  	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
  		goto err;
  
- 	mpf = array->mpfarray[offset].mpf;
  	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
  	/* Someone could be real slow, let them close it down. */
  	if (array->mpfarray[offset].pinref != 0)
--- 424,429 ----
Commit	Line	Data
e9a6cd08 JB	1	*** qam/qam_files.c.orig 2005-10-20 11:57:12.000000000 -0700
	2	--- qam/qam_files.c 2006-01-27 13:38:38.000000000 -0800
	3	***************
	4	* 411,416 **
	5	--- 411,422 ----
	6	DB_APP_DATA, buf, 0, NULL, &real_name)) != 0)
	7	goto err;
	8	#endif
	9	+
	10	+ mpf = array->mpfarray[offset].mpf;
	11	+ /* This extent my already be marked for delete and closed. */
	12	+ if (mpf == NULL)
	13	+ goto err;
	14	+
	15	/*
	16	* The log must be flushed before the file is deleted. We depend on
	17	* the log record of the last delete to recreate the file if we crash.
	18	***************
	19	* 418,424 **
	20	if (LOGGING_ON(dbenv) && (ret = __log_flush(dbenv, NULL)) != 0)
	21	goto err;
	22
	23	- mpf = array->mpfarray[offset].mpf;
	24	(void)__memp_set_flags(mpf, DB_MPOOL_UNLINK, 1);
	25	/* Someone could be real slow, let them close it down. */
	26	if (array->mpfarray[offset].pinref != 0)
	27	--- 424,429 ----