diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 07:08:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 07:08:57 -0400 |
| commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
| tree | 81dcf756db373444140bb2623584710c628e3048 /include/linux/fs_struct.h | |
| parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'include/linux/fs_struct.h')
| -rw-r--r-- | include/linux/fs_struct.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h index 282f54219129..9e5a06e78d02 100644 --- a/include/linux/fs_struct.h +++ b/include/linux/fs_struct.h | |||
| @@ -7,7 +7,7 @@ struct fs_struct { | |||
| 7 | atomic_t count; | 7 | atomic_t count; |
| 8 | rwlock_t lock; | 8 | rwlock_t lock; |
| 9 | int umask; | 9 | int umask; |
| 10 | struct path root, pwd, altroot; | 10 | struct path root, pwd; |
| 11 | }; | 11 | }; |
| 12 | 12 | ||
| 13 | #define INIT_FS { \ | 13 | #define INIT_FS { \ |
| @@ -19,7 +19,6 @@ struct fs_struct { | |||
| 19 | extern struct kmem_cache *fs_cachep; | 19 | extern struct kmem_cache *fs_cachep; |
| 20 | 20 | ||
| 21 | extern void exit_fs(struct task_struct *); | 21 | extern void exit_fs(struct task_struct *); |
| 22 | extern void set_fs_altroot(void); | ||
| 23 | extern void set_fs_root(struct fs_struct *, struct path *); | 22 | extern void set_fs_root(struct fs_struct *, struct path *); |
| 24 | extern void set_fs_pwd(struct fs_struct *, struct path *); | 23 | extern void set_fs_pwd(struct fs_struct *, struct path *); |
| 25 | extern struct fs_struct *copy_fs_struct(struct fs_struct *); | 24 | extern struct fs_struct *copy_fs_struct(struct fs_struct *); |
