file RCU optimization: Drop rcu field and restore old name for fu_list. The slab has its own RCU blocks so no need to have that in the files structure. Signed-off-by: Christoph Lameter Index: linux-2.6.18-rc1-mm1/drivers/char/tty_io.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/drivers/char/tty_io.c 2006-07-10 10:33:42.027929425 -0700 +++ linux-2.6.18-rc1-mm1/drivers/char/tty_io.c 2006-07-10 16:27:50.707147904 -0700 @@ -1035,7 +1035,7 @@ static void do_tty_hangup(void *data) check_tty_count(tty, "do_tty_hangup"); file_list_lock(); /* This breaks for file handles being sent over AF_UNIX sockets ? */ - list_for_each_entry(filp, &tty->tty_files, f_u.fu_list) { + list_for_each_entry(filp, &tty->tty_files, f_list) { if (filp->f_op->write == redirected_tty_write) cons_filp = filp; if (filp->f_op->write != tty_write) Index: linux-2.6.18-rc1-mm1/fs/dquot.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/fs/dquot.c 2006-07-10 10:33:43.479987835 -0700 +++ linux-2.6.18-rc1-mm1/fs/dquot.c 2006-07-10 16:27:50.708124406 -0700 @@ -693,7 +693,7 @@ static void add_dquot_ref(struct super_b restart: file_list_lock(); list_for_each(p, &sb->s_files) { - struct file *filp = list_entry(p, struct file, f_u.fu_list); + struct file *filp = list_entry(p, struct file, f_list); struct inode *inode = filp->f_dentry->d_inode; if (filp->f_mode & FMODE_WRITE && dqinit_needed(inode, type)) { struct dentry *dentry = dget(filp->f_dentry); Index: linux-2.6.18-rc1-mm1/security/selinux/selinuxfs.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/security/selinux/selinuxfs.c 2006-07-10 10:33:44.409617698 -0700 +++ linux-2.6.18-rc1-mm1/security/selinux/selinuxfs.c 2006-07-10 16:27:50.710077410 -0700 @@ -964,7 +964,7 @@ static void sel_remove_bools(struct dent file_list_lock(); list_for_each(p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_u.fu_list); + struct file * filp = list_entry(p, struct file, f_list); struct dentry * dentry = filp->f_dentry; if (dentry->d_parent != de) { Index: linux-2.6.18-rc1-mm1/include/linux/fs.h =================================================================== --- linux-2.6.18-rc1-mm1.orig/include/linux/fs.h 2006-07-10 16:27:41.827815595 -0700 +++ linux-2.6.18-rc1-mm1/include/linux/fs.h 2006-07-10 16:27:50.712030413 -0700 @@ -745,14 +745,7 @@ struct file_ra_state { #define RA_FLAG_EOF (1UL<<27) /* readahead hits EOF */ struct file { - /* - * fu_list becomes invalid after file_free is called and queued via - * fu_rcuhead for RCU freeing - */ - union { - struct list_head fu_list; - struct rcu_head fu_rcuhead; - } f_u; + struct list_head f_list; struct dentry *f_dentry; struct vfsmount *f_vfsmnt; const struct file_operations *f_op; Index: linux-2.6.18-rc1-mm1/fs/file_table.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/fs/file_table.c 2006-07-10 16:27:47.810843095 -0700 +++ linux-2.6.18-rc1-mm1/fs/file_table.c 2006-07-10 16:27:50.712030413 -0700 @@ -43,7 +43,7 @@ static void filp_constructor(void *data, return; memset(f, 0, sizeof(*f)); - INIT_LIST_HEAD(&f->f_u.fu_list); + INIT_LIST_HEAD(&f->f_list); atomic_set(&f->f_count, 0); rwlock_init(&f->f_owner.lock); eventpoll_init_file(f); @@ -271,15 +271,15 @@ void file_move(struct file *file, struct if (!list) return; file_list_lock(); - list_move(&file->f_u.fu_list, list); + list_move(&file->f_list, list); file_list_unlock(); } void file_kill(struct file *file) { - if (!list_empty(&file->f_u.fu_list)) { + if (!list_empty(&file->f_list)) { file_list_lock(); - list_del_init(&file->f_u.fu_list); + list_del_init(&file->f_list); file_list_unlock(); } } @@ -291,7 +291,7 @@ int fs_may_remount_ro(struct super_block /* Check that no files are currently opened for writing. */ file_list_lock(); list_for_each(p, &sb->s_files) { - struct file *file = list_entry(p, struct file, f_u.fu_list); + struct file *file = list_entry(p, struct file, f_list); struct inode *inode = file->f_dentry->d_inode; /* File with pending delete? */ Index: linux-2.6.18-rc1-mm1/fs/super.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/fs/super.c 2006-07-05 21:09:49.000000000 -0700 +++ linux-2.6.18-rc1-mm1/fs/super.c 2006-07-10 16:27:50.713006915 -0700 @@ -519,7 +519,7 @@ static void mark_files_ro(struct super_b struct file *f; file_list_lock(); - list_for_each_entry(f, &sb->s_files, f_u.fu_list) { + list_for_each_entry(f, &sb->s_files, f_list) { if (S_ISREG(f->f_dentry->d_inode->i_mode) && file_count(f)) f->f_mode &= ~FMODE_WRITE; } Index: linux-2.6.18-rc1-mm1/security/selinux/hooks.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/security/selinux/hooks.c 2006-07-10 10:33:44.407664694 -0700 +++ linux-2.6.18-rc1-mm1/security/selinux/hooks.c 2006-07-10 16:27:50.715936421 -0700 @@ -1713,7 +1713,7 @@ static inline void flush_unauthorized_fi if (tty) { file_list_lock(); - file = list_entry(tty->tty_files.next, typeof(*file), f_u.fu_list); + file = list_entry(tty->tty_files.next, typeof(*file), f_list); if (file) { /* Revalidate access to controlling tty. Use inode_has_perm on the tty inode directly rather Index: linux-2.6.18-rc1-mm1/fs/proc/generic.c =================================================================== --- linux-2.6.18-rc1-mm1.orig/fs/proc/generic.c 2006-07-05 21:09:49.000000000 -0700 +++ linux-2.6.18-rc1-mm1/fs/proc/generic.c 2006-07-10 16:27:50.716912923 -0700 @@ -557,7 +557,7 @@ static void proc_kill_inodes(struct proc */ file_list_lock(); list_for_each(p, &sb->s_files) { - struct file * filp = list_entry(p, struct file, f_u.fu_list); + struct file * filp = list_entry(p, struct file, f_list); struct dentry * dentry = filp->f_dentry; struct inode * inode; const struct file_operations *fops;