diff options
Diffstat (limited to 'src/backend/port/sysv_shmem.c')
| -rw-r--r-- | src/backend/port/sysv_shmem.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index 8cdabf244b1..01385032740 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.56 2010/05/01 22:46:30 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.57 2010/07/06 19:18:57 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,17 +93,17 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) return NULL; /* - * Some BSD-derived kernels are known to return EINVAL, not EEXIST, - * if there is an existing segment but it's smaller than "size" - * (this is a result of poorly-thought-out ordering of error tests). - * To distinguish between collision and invalid size in such cases, - * we make a second try with size = 0. These kernels do not test - * size against SHMMIN in the preexisting-segment case, so we will - * not get EINVAL a second time if there is such a segment. + * Some BSD-derived kernels are known to return EINVAL, not EEXIST, if + * there is an existing segment but it's smaller than "size" (this is + * a result of poorly-thought-out ordering of error tests). To + * distinguish between collision and invalid size in such cases, we + * make a second try with size = 0. These kernels do not test size + * against SHMMIN in the preexisting-segment case, so we will not get + * EINVAL a second time if there is such a segment. */ if (errno == EINVAL) { - int save_errno = errno; + int save_errno = errno; shmid = shmget(memKey, 0, IPC_CREAT | IPC_EXCL | IPCProtection); @@ -122,9 +122,9 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) { /* * On most platforms we cannot get here because SHMMIN is - * greater than zero. However, if we do succeed in creating - * a zero-size segment, free it and then fall through to - * report the original error. + * greater than zero. However, if we do succeed in creating a + * zero-size segment, free it and then fall through to report + * the original error. */ if (shmctl(shmid, IPC_RMID, NULL) < 0) elog(LOG, "shmctl(%d, %d, 0) failed: %m", |