summaryrefslogtreecommitdiffstats
path: root/fs/file_table.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2009-02-06 21:52:43 +0100
committerJonathan Corbet <corbet@lwn.net>2009-03-16 15:32:27 +0100
commit684999149002dd046269666a390458e0acb38280 (patch)
treeb12ea4a953ba2bd90428092e7f35a222a4109510 /fs/file_table.c
parentLinus 2.6.29-rc8 (diff)
downloadlinux-684999149002dd046269666a390458e0acb38280.tar.xz
linux-684999149002dd046269666a390458e0acb38280.zip
Rename struct file->f_ep_lock
This lock moves out of the CONFIG_EPOLL ifdef and becomes f_lock. For now, epoll remains the only user, but a future patch will use it to protect f_flags as well. Cc: Davide Libenzi <davidel@xmailserver.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'fs/file_table.c')
-rw-r--r--fs/file_table.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index bbeeac6efa1a..aa1e18050282 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -127,6 +127,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;