The patch titled Restore shmid as inode# to fix /proc/pid/maps ABI breakage has been added to the -mm tree. Its filename is restore-shmid-as-inode-to-fix-proc-pid-maps-abi-breakage.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Restore shmid as inode# to fix /proc/pid/maps ABI breakage From: Badari Pulavarty <pbadari@xxxxxxxxxx> shmid used to be stored as inode# for shared memory segments. Some of the proc-ps tools use this from /proc/pid/maps. Recent cleanups to newseg() changed it. This patch sets inode number back to shared memory id to fix breakage. Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx> Cc: "Albert Cahalan" <acahalan@xxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/shm.c | 5 +++++ 1 files changed, 5 insertions(+) diff -puN ipc/shm.c~restore-shmid-as-inode-to-fix-proc-pid-maps-abi-breakage ipc/shm.c --- a/ipc/shm.c~restore-shmid-as-inode-to-fix-proc-pid-maps-abi-breakage +++ a/ipc/shm.c @@ -397,6 +397,11 @@ static int newseg (struct ipc_namespace 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); _ Patches currently in -mm which might be from pbadari@xxxxxxxxxx are move-three-functions-that-are-only-needed-for.patch restore-shmid-as-inode-to-fix-proc-pid-maps-abi-breakage.patch ext3-convert-to-new-aops.patch ext4-convert-to-new-aops.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html