diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-07 05:45:25 -0500 |
| commit | a23e66f3b8cfdedec14541e71ef29a754870a20c (patch) | |
| tree | f8ac23572982e92e6f8ae09c4039db627bdf53ee /include/linux/fs.h | |
| parent | 04c470adb01c62bb9bd663cfc4875cf0a4eb01ab (diff) | |
| parent | ede6f5aea054d3fb67c78857f7abdee602302043 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index fb59673c60b1..d7eba77f666e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -1133,7 +1133,6 @@ struct super_block { | |||
| 1133 | struct rw_semaphore s_umount; | 1133 | struct rw_semaphore s_umount; |
| 1134 | struct mutex s_lock; | 1134 | struct mutex s_lock; |
| 1135 | int s_count; | 1135 | int s_count; |
| 1136 | int s_syncing; | ||
| 1137 | int s_need_sync_fs; | 1136 | int s_need_sync_fs; |
| 1138 | atomic_t s_active; | 1137 | atomic_t s_active; |
| 1139 | #ifdef CONFIG_SECURITY | 1138 | #ifdef CONFIG_SECURITY |