Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index da806aceae3f7c350c449821defb7647234c2840..54018fe488403082ac5274e24a3fee9480fa0a16 100644 (file)
--- 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;
@@ -168,7 +169,6 @@ struct file *alloc_file(struct vfsmount *mnt, struct dentry *dentry,
                fmode_t mode, const struct file_operations *fop)
 {
        struct file *file;
-       struct path;
 
        file = get_empty_filp();
        if (!file)