diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-23 12:24:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-23 12:24:19 -0700 |
| commit | 79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4 (patch) | |
| tree | 0dafecbb8f729aed249e5ff66daa21a6136759c6 /include/linux/mount.h | |
| parent | b0d19a378a409373244088511e889957645f2a44 (diff) | |
| parent | 97e7e0f71d6d948c25f11f0a33878d9356d9579e (diff) | |
| download | talos-op-linux-79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4.tar.gz talos-op-linux-79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[patch 7/7] vfs: mountinfo: show dominating group id
[patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
[patch 5/7] vfs: mountinfo: allow using process root
[patch 4/7] vfs: mountinfo: add mount peer group ID
[patch 3/7] vfs: mountinfo: add mount ID
[patch 2/7] vfs: mountinfo: add seq_file_root()
[patch 1/7] vfs: mountinfo: add dentry_path()
[PATCH] remove unused label in xattr.c (noise from ro-bind)
Diffstat (limited to 'include/linux/mount.h')
| -rw-r--r-- | include/linux/mount.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index 87b24cea1863..b4836d58f428 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -56,6 +56,8 @@ struct vfsmount { struct list_head mnt_slave; /* slave list entry */ struct vfsmount *mnt_master; /* slave is on master->mnt_slave_list */ struct mnt_namespace *mnt_ns; /* containing namespace */ + int mnt_id; /* mount identifier */ + int mnt_group_id; /* peer group identifier */ /* * We put mnt_count & mnt_expiry_mark at the end of struct vfsmount * to let these frequently modified fields in a separate cache line |
