diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 14:23:54 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-11 14:23:54 +1100 |
| commit | 4ef9dd3842a302209fc47ce39c3dab482c294975 (patch) | |
| tree | f6119a170e5bfc7728807d4cec14620761b58604 /include/linux | |
| parent | 62c71a4216017ee00a936eca783e0b50144c7d4d (diff) | |
| parent | 5c7eec1a9b90b18837a45cccb7fe3c182dce57d0 (diff) | |
Merge commit 'bkl-removal/bkl-removal'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/eventpoll.h | 1 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
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; static inline void eventpoll_init_file(struct file *file) { INIT_LIST_HEAD(&file->f_ep_links); - spin_lock_init(&file->f_ep_lock); } diff --git a/include/linux/fs.h b/include/linux/fs.h index b26d7f6d9c10..f22ce7334fcd 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -847,6 +847,7 @@ struct file { #define f_dentry f_path.dentry #define f_vfsmnt f_path.mnt const struct file_operations *f_op; + spinlock_t f_lock; /* f_ep_links, f_flags */ atomic_long_t f_count; unsigned int f_flags; fmode_t f_mode; @@ -865,7 +866,6 @@ struct file { #ifdef CONFIG_EPOLL /* Used by fs/eventpoll.c to link all the hooks to this file */ struct list_head f_ep_links; - spinlock_t f_ep_lock; #endif /* #ifdef CONFIG_EPOLL */ struct address_space *f_mapping; #ifdef CONFIG_DEBUG_WRITECOUNT |