diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /ipc/shm.c | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'ipc/shm.c')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -279,7 +279,7 @@ static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size) | |||
| 279 | if (size < SHMMIN || size > ns->shm_ctlmax) | 279 | if (size < SHMMIN || size > ns->shm_ctlmax) |
| 280 | return -EINVAL; | 280 | return -EINVAL; |
| 281 | 281 | ||
| 282 | if (ns->shm_tot + numpages >= ns->shm_ctlall) | 282 | if (ns->shm_tot + numpages > ns->shm_ctlall) |
| 283 | return -ENOSPC; | 283 | return -ENOSPC; |
| 284 | 284 | ||
| 285 | shp = ipc_rcu_alloc(sizeof(*shp)); | 285 | shp = ipc_rcu_alloc(sizeof(*shp)); |