diff options
| author | Linus Torvalds | 2009-03-27 00:14:02 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-03-27 00:14:02 +0100 |
| commit | 8e9d2089723d08d51e66c5eea49253d76e27941e (patch) | |
| tree | cf15609d5eeb0c1f3a39231d8ce793d3c8ad0ed0 /fs/file_table.c | |
| parent | Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | Rationalize fasync return values (diff) | |
| download | kernel-qcow2-linux-8e9d2089723d08d51e66c5eea49253d76e27941e.tar.gz kernel-qcow2-linux-8e9d2089723d08d51e66c5eea49253d76e27941e.tar.xz kernel-qcow2-linux-8e9d2089723d08d51e66c5eea49253d76e27941e.zip | |
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 'fs/file_table.c')
| -rw-r--r-- | fs/file_table.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index da806aceae3f..b74a8e1da913 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -128,6 +128,7 @@ struct file *get_empty_filp(void) atomic_long_set(&f->f_count, 1); rwlock_init(&f->f_owner.lock); f->f_cred = get_cred(cred); + spin_lock_init(&f->f_lock); eventpoll_init_file(f); /* f->f_version: 0 */ return f; |