Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/epoll-0.15

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5694a661878e..0adb782c7ac7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -504,6 +504,10 @@ struct file {
 
 	/* needed for tty driver, and maybe others */
 	void			*private_data;
+
+	/* file callback list */
+	rwlock_t f_cblock;
+	struct list_head f_cblist;
 };
 extern spinlock_t files_lock;
 #define file_list_lock() spin_lock(&files_lock);