summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 22:31:47 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 22:31:47 +0400
commit2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca (patch)
tree4e8fff4b3de41cec400385fdadd143c8d5d91904 /include
parent915db32ddbc967f023fbf7d7f01cca9e05606a9b (diff)
parent4a6a4499693a419a20559c41e33a7bd70bf20a6f (diff)
downloadlinux-2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca.tar.xz
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* 'bkl-removal' of git://git.lwn.net/linux-2.6: Fix a lockdep warning in fasync_helper() Add a missing unlock_kernel() in raw_open()
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 42436ae42f70..87e7bfc5ebd7 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -849,7 +849,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 */
+ spinlock_t f_lock; /* f_ep_links, f_flags, no IRQ */
atomic_long_t f_count;
unsigned int f_flags;
fmode_t f_mode;