Merge branch 'wip-nested-locking' into tegra-nested-lockingwip-nested-locking

Conflicts:
	Makefile
	include/linux/fs.h

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/inode.c b/fs/inode.c
index ec7924696a1..d858c6b9823 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -299,6 +299,8 @@ void inode_init_once(struct inode *inode)
 #ifdef CONFIG_FSNOTIFY
         INIT_HLIST_HEAD(&inode->i_fsnotify_marks);
 #endif
+        INIT_LIST_HEAD(&inode->i_obj_list);
+        mutex_init(&inode->i_obj_mutex);
 }
 EXPORT_SYMBOL(inode_init_once);