diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 11:31:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 11:31:47 -0700 |
| commit | 2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca (patch) | |
| tree | 4e8fff4b3de41cec400385fdadd143c8d5d91904 /include/linux | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | Fix a lockdep warning in fasync_helper() (diff) | |
| download | linux-dev-2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca.tar.xz linux-dev-2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca.zip | |
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/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
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; |