From 524ecf49646e2fbc013d4dccecc3076b35f93836 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sun, 13 Nov 2005 16:06:24 -0800 Subject: [PATCH] --- yaml --- r: 14025 b: refs/heads/master c: 95e861db3eaba7bc99f8605db70103ec3d078203 h: refs/heads/master i: 14023: d3facca947360bdc58caa32c4ab5d20411dbac0e v: v3 --- [refs] | 2 +- trunk/include/linux/file.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 17cf048d8b2d..67f9d15ddcc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6c7ac081bf6cafcf780b919ee97978f1d01a0d7 +refs/heads/master: 95e861db3eaba7bc99f8605db70103ec3d078203 diff --git a/trunk/include/linux/file.h b/trunk/include/linux/file.h index d3b1a15d5f21..418b6101b59a 100644 --- a/trunk/include/linux/file.h +++ b/trunk/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))