Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57835
b: refs/heads/master
c: 30475cc
h: refs/heads/master
i:
  57833: 9b4d469
  57831: 44d8a3b
v: v3
  • Loading branch information
Badari Pulavarty authored and Linus Torvalds committed Jun 16, 2007
1 parent 0ddba94 commit 21dd878
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dd08c40e3e23f868eb0e49f638eb208736ec7e66
refs/heads/master: 30475cc12a50816f290828fb7e3cd7036cd622df
5 changes: 5 additions & 0 deletions trunk/ipc/shm.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,11 @@ static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
shp->shm_nattch = 0;
shp->id = shm_buildid(ns, id, shp->shm_perm.seq);
shp->shm_file = file;
/*
* shmid gets reported as "inode#" in /proc/pid/maps.
* proc-ps tools use this. Changing this will break them.
*/
file->f_dentry->d_inode->i_ino = shp->id;

ns->shm_tot += numpages;
shm_unlock(shp);
Expand Down

0 comments on commit 21dd878

Please sign in to comment.