Merge branch 'work'

[linux-2.6-omap-h63xx.git] / include / linux / file.h

diff --git a/include/linux/file.h b/include/linux/file.h
index d3b1a15d5f21b378731bd2fca44edd2be5d3dc5d..418b6101b59a02d8b9efb7501e3de51808a59f95 100644 (file)
--- a/include/linux/file.h
+++ b/include/linux/file.h
@@ -33,13 +33,13 @@ struct fdtable {
  * Open file table structure
  */
 struct files_struct {
-        atomic_t count;
-        spinlock_t file_lock;     /* Protects all the below members.  Nests inside tsk->alloc_lock */
+       atomic_t count;
        struct fdtable *fdt;
        struct fdtable fdtab;
-        fd_set close_on_exec_init;
-        fd_set open_fds_init;
-        struct file * fd_array[NR_OPEN_DEFAULT];
+       fd_set close_on_exec_init;
+       fd_set open_fds_init;
+       struct file * fd_array[NR_OPEN_DEFAULT];
+       spinlock_t file_lock;     /* Protects concurrent writers.  Nests inside tsk->alloc_lock */
 };
 
 #define files_fdtable(files) (rcu_dereference((files)->fdt))