From: Benjamin LaHaise 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 Cc: Davide Libenzi Signed-off-by: Andrew Morton --- fs/eventpoll.c | 9 --------- fs/file_table.c | 10 ++++++---- include/linux/eventpoll.h | 8 ++++++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff -puN fs/eventpoll.c~get_empty_filp-tweaks-inline-epoll_init_file fs/eventpoll.c --- 25/fs/eventpoll.c~get_empty_filp-tweaks-inline-epoll_init_file Tue Jan 24 12:56:14 2006 +++ 25-akpm/fs/eventpoll.c Tue Jan 24 12:56:14 2006 @@ -452,15 +452,6 @@ static void ep_poll_safewake(struct poll } -/* Used to initialize the epoll bits inside the "struct file" */ -void eventpoll_init_file(struct file *file) -{ - - INIT_LIST_HEAD(&file->f_ep_links); - spin_lock_init(&file->f_ep_lock); -} - - /* * This is called from eventpoll_release() to unlink files from the eventpoll * interface. We need to have this facility to cleanup correctly files that are diff -puN fs/file_table.c~get_empty_filp-tweaks-inline-epoll_init_file fs/file_table.c --- 25/fs/file_table.c~get_empty_filp-tweaks-inline-epoll_init_file Tue Jan 24 12:56:14 2006 +++ 25-akpm/fs/file_table.c Tue Jan 24 12:56:14 2006 @@ -72,6 +72,7 @@ static inline void file_free(struct file */ struct file *get_empty_filp(void) { + struct task_struct *tsk; static int old_max; struct file * f; @@ -90,13 +91,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: diff -puN include/linux/eventpoll.h~get_empty_filp-tweaks-inline-epoll_init_file include/linux/eventpoll.h --- 25/include/linux/eventpoll.h~get_empty_filp-tweaks-inline-epoll_init_file Tue Jan 24 12:56:14 2006 +++ 25-akpm/include/linux/eventpoll.h Tue Jan 24 12:56:14 2006 @@ -52,7 +52,12 @@ struct file; #ifdef CONFIG_EPOLL /* Used to initialize the epoll bits inside the "struct file" */ -void eventpoll_init_file(struct file *file); +static inline void eventpoll_init_file(struct file *file) +{ + INIT_LIST_HEAD(&file->f_ep_links); + spin_lock_init(&file->f_ep_lock); +} + /* Used to release the epoll bits inside the "struct file" */ void eventpoll_release_file(struct file *file); @@ -85,7 +90,6 @@ static inline void eventpoll_release(str eventpoll_release_file(file); } - #else static inline void eventpoll_init_file(struct file *file) {} _