diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 00:16:22 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 00:16:22 -0500 |
| commit | a1f3d4bba8ea395a39d34ade6017afee8be16031 (patch) | |
| tree | 874d843d35622f17aa6c3e048e42cf0d679bcb75 /include/linux/fs_struct.h | |
| parent | 723d928417bffff6467da155d8ebbbe016464012 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'include/linux/fs_struct.h')
| -rw-r--r-- | include/linux/fs_struct.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h index a42b5bf02f8b..003dc0fd7347 100644 --- a/include/linux/fs_struct.h +++ b/include/linux/fs_struct.h | |||
| @@ -2,10 +2,13 @@ | |||
| 2 | #define _LINUX_FS_STRUCT_H | 2 | #define _LINUX_FS_STRUCT_H |
| 3 | 3 | ||
| 4 | #include <linux/path.h> | 4 | #include <linux/path.h> |
| 5 | #include <linux/spinlock.h> | ||
| 6 | #include <linux/seqlock.h> | ||
| 5 | 7 | ||
| 6 | struct fs_struct { | 8 | struct fs_struct { |
| 7 | int users; | 9 | int users; |
| 8 | spinlock_t lock; | 10 | spinlock_t lock; |
| 11 | seqcount_t seq; | ||
| 9 | int umask; | 12 | int umask; |
| 10 | int in_exec; | 13 | int in_exec; |
| 11 | struct path root, pwd; | 14 | struct path root, pwd; |
