aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:14:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-26 19:14:02 -0400
commit8e9d2089723d08d51e66c5eea49253d76e27941e (patch)
treecf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /include
parentba1eb95cf3cc666769afe42eaa15a3a34ae82f94 (diff)
parent60aa49243d09afc873f082567d2e3c16634ced84 (diff)
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6: Rationalize fasync return values Move FASYNC bit handling to f_op->fasync() Use f_lock to protect f_flags Rename struct file->f_ep_lock
Diffstat (limited to 'include')
-rw-r--r--include/linux/eventpoll.h1
-rw-r--r--include/linux/fs.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index f1e1d3c47125..f6856a5a1d4b 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -61,7 +61,6 @@ struct file;
61static inline void eventpoll_init_file(struct file *file) 61static inline void eventpoll_init_file(struct file *file)
62{ 62{
63 INIT_LIST_HEAD(&file->f_ep_links); 63 INIT_LIST_HEAD(&file->f_ep_links);
64 spin_lock_init(&file->f_ep_lock);
65} 64}
66 65
67 66
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 5bc81c4a98c1..1cd44f727dac 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -849,6 +849,7 @@ struct file {
849#define f_dentry f_path.dentry 849#define f_dentry f_path.dentry
850#define f_vfsmnt f_path.mnt 850#define f_vfsmnt f_path.mnt
851 const struct file_operations *f_op; 851 const struct file_operations *f_op;
852 spinlock_t f_lock; /* f_ep_links, f_flags */
852 atomic_long_t f_count; 853 atomic_long_t f_count;
853 unsigned int f_flags; 854 unsigned int f_flags;
854 fmode_t f_mode; 855 fmode_t f_mode;
@@ -867,7 +868,6 @@ struct file {
867#ifdef CONFIG_EPOLL 868#ifdef CONFIG_EPOLL
868 /* Used by fs/eventpoll.c to link all the hooks to this file */ 869 /* Used by fs/eventpoll.c to link all the hooks to this file */
869 struct list_head f_ep_links; 870 struct list_head f_ep_links;
870 spinlock_t f_ep_lock;
871#endif /* #ifdef CONFIG_EPOLL */ 871#endif /* #ifdef CONFIG_EPOLL */
872 struct address_space *f_mapping; 872 struct address_space *f_mapping;
873#ifdef CONFIG_DEBUG_WRITECOUNT 873#ifdef CONFIG_DEBUG_WRITECOUNT