author: Benjamin LaHaise <bcrl@linux.intel.com> 2006-03-23 03:01:03 -0800
committer: Linus Torvalds <torvalds@g5.osdl.org> 2006-03-23 07:38:17 -0800
commit: 5a6b7951bfcca7f45f44269ea87417c74558daf8
parent: 0b2fcfdb8b4e7e379192f24ea2203163ddf5df1d
Commit Summary:
Diffstat:
1 file changed, 6 insertions, 4 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 44fabeaa9415..bcea1998b4de 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -88,6 +88,7 @@ int proc_nr_files(ctl_table *table, int write, struct file *filp,
*/
struct file *get_empty_filp(void)
{
+ struct task_struct *tsk;
static int old_max;
struct file * f;
@@ -112,13 +113,14 @@ struct file *get_empty_filp(void)
if (security_file_alloc(f))
goto fail_sec;
- eventpoll_init_file(f);
+ tsk = current;
+ INIT_LIST_HEAD(&f->f_u.fu_list);
atomic_set(&f->f_count, 1);
- f->f_uid = current->fsuid;
- f->f_gid = current->fsgid;
rwlock_init(&f->f_owner.lock);
+ f->f_uid = tsk->fsuid;
+ f->f_gid = tsk->fsgid;
+ eventpoll_init_file(f);
/* f->f_version: 0 */
- INIT_LIST_HEAD(&f->f_u.fu_list);
return f;
over: