diff options
author | Benjamin LaHaise <bcrl@linux.intel.com> | 2006-03-23 06:01:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:17 -0500 |
commit | 5a6b7951bfcca7f45f44269ea87417c74558daf8 (patch) | |
tree | f9cc8b3f89c89802e81b37d77c6f698e373bfe51 /fs | |
parent | 0b2fcfdb8b4e7e379192f24ea2203163ddf5df1d (diff) |
[PATCH] get_empty_filp tweaks, inline epoll_init_file()
Eliminate a handful of cache references by keeping current in a register
instead of reloading (helps x86) and avoiding the overhead of a function
call. Inlining eventpoll_init_file() saves 24 bytes. Also reorder file
initialization to make writes occur more sequentially.
Signed-off-by: Benjamin LaHaise <bcrl@linux.intel.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/eventpoll.c | 9 | ||||
-rw-r--r-- | fs/file_table.c | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index f5d69f46ba9b..1c2b16fda13a 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c | |||
@@ -452,15 +452,6 @@ static void ep_poll_safewake(struct poll_safewake *psw, wait_queue_head_t *wq) | |||
452 | } | 452 | } |
453 | 453 | ||
454 | 454 | ||
455 | /* Used to initialize the epoll bits inside the "struct file" */ | ||
456 | void eventpoll_init_file(struct file *file) | ||
457 | { | ||
458 | |||
459 | INIT_LIST_HEAD(&file->f_ep_links); | ||
460 | spin_lock_init(&file->f_ep_lock); | ||
461 | } | ||
462 | |||
463 | |||
464 | /* | 455 | /* |
465 | * This is called from eventpoll_release() to unlink files from the eventpoll | 456 | * This is called from eventpoll_release() to unlink files from the eventpoll |
466 | * interface. We need to have this facility to cleanup correctly files that are | 457 | * interface. We need to have this facility to cleanup correctly files that are |
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, | |||
88 | */ | 88 | */ |
89 | struct file *get_empty_filp(void) | 89 | struct file *get_empty_filp(void) |
90 | { | 90 | { |
91 | struct task_struct *tsk; | ||
91 | static int old_max; | 92 | static int old_max; |
92 | struct file * f; | 93 | struct file * f; |
93 | 94 | ||
@@ -112,13 +113,14 @@ struct file *get_empty_filp(void) | |||
112 | if (security_file_alloc(f)) | 113 | if (security_file_alloc(f)) |
113 | goto fail_sec; | 114 | goto fail_sec; |
114 | 115 | ||
115 | eventpoll_init_file(f); | 116 | tsk = current; |
117 | INIT_LIST_HEAD(&f->f_u.fu_list); | ||
116 | atomic_set(&f->f_count, 1); | 118 | atomic_set(&f->f_count, 1); |
117 | f->f_uid = current->fsuid; | ||
118 | f->f_gid = current->fsgid; | ||
119 | rwlock_init(&f->f_owner.lock); | 119 | rwlock_init(&f->f_owner.lock); |
120 | f->f_uid = tsk->fsuid; | ||
121 | f->f_gid = tsk->fsgid; | ||
122 | eventpoll_init_file(f); | ||
120 | /* f->f_version: 0 */ | 123 | /* f->f_version: 0 */ |
121 | INIT_LIST_HEAD(&f->f_u.fu_list); | ||
122 | return f; | 124 | return f; |
123 | 125 | ||
124 | over: | 126 | over: |