patch-2.4.1 linux/ipc/shm.c
Next file: linux/kernel/context.c
Previous file: linux/include/net/x25.h
Back to the patch index
Back to the overall index
- Lines: 21
- Date:
Sun Jan 14 11:22:21 2001
- Orig file:
v2.4.0/linux/ipc/shm.c
- Orig date:
Fri Dec 29 14:21:48 2000
diff -u --recursive --new-file v2.4.0/linux/ipc/shm.c linux/ipc/shm.c
@@ -121,6 +121,7 @@
{
shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT;
shm_rmid (shp->id);
+ shmem_lock(shp->shm_file, 0);
fput (shp->shm_file);
kfree (shp);
}
@@ -467,10 +468,10 @@
if(err)
goto out_unlock;
if(cmd==SHM_LOCK) {
- shp->shm_file->f_dentry->d_inode->u.shmem_i.locked = 1;
+ shmem_lock(shp->shm_file, 1);
shp->shm_flags |= SHM_LOCKED;
} else {
- shp->shm_file->f_dentry->d_inode->u.shmem_i.locked = 0;
+ shmem_lock(shp->shm_file, 0);
shp->shm_flags &= ~SHM_LOCKED;
}
shm_unlock(shmid);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)