projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tpmdd-next-20151110' of https://github.com/jsakkine/linux-tpmdd into for...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ext2
/
super.c
diff --git
a/fs/ext2/super.c
b/fs/ext2/super.c
index 900e19cf9ef6fbb4057e95f2cc1f81c44ccd3377..3a71cea684208f16beb587f61989bfffb0a0d006 100644
(file)
--- a/
fs/ext2/super.c
+++ b/
fs/ext2/super.c
@@
-192,6
+192,9
@@
static void init_once(void *foo)
init_rwsem(&ei->xattr_sem);
#endif
mutex_init(&ei->truncate_mutex);
init_rwsem(&ei->xattr_sem);
#endif
mutex_init(&ei->truncate_mutex);
+#ifdef CONFIG_FS_DAX
+ init_rwsem(&ei->dax_sem);
+#endif
inode_init_once(&ei->vfs_inode);
}
inode_init_once(&ei->vfs_inode);
}