Pull netlink into release branch

[firefly-linux-kernel-4.4.55.git] / fs / afs / super.c

diff --git a/fs/afs/super.c b/fs/afs/super.c
index 8d47ad88a0932b2d4fdea8bbcbfb07de9e7cb4f6..b8808b40f82b3c01f35fb37e3c88a67a36775170 100644 (file)
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
@@ -22,6 +22,7 @@
 #include <linux/pagemap.h>
 #include <linux/parser.h>
 #include <linux/statfs.h>
+#include <linux/sched.h>
 #include "internal.h"
 
 #define AFS_FS_MAGIC 0x6B414653 /* 'kAFS' */
@@ -88,8 +89,7 @@ int __init afs_fs_init(void)
                                             sizeof(struct afs_vnode),
                                             0,
                                             SLAB_HWCACHE_ALIGN,
-                                            afs_i_init_once,
-                                            NULL);
+                                            afs_i_init_once);
        if (!afs_inode_cachep) {
                printk(KERN_NOTICE "kAFS: Failed to allocate inode cache\n");
                return ret;
@@ -459,6 +459,9 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep,
        spin_lock_init(&vnode->writeback_lock);
        spin_lock_init(&vnode->lock);
        INIT_LIST_HEAD(&vnode->writebacks);
+       INIT_LIST_HEAD(&vnode->pending_locks);
+       INIT_LIST_HEAD(&vnode->granted_locks);
+       INIT_DELAYED_WORK(&vnode->lock_work, afs_lock_work);
        INIT_WORK(&vnode->cb_broken_work, afs_broken_callback_work);
 }