Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio

[linux-drm-fsl-dcu.git] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 5bb85a064ce7fade86383db89c252fe920032279..e491e54d243025999e42fdec674b082a765188fd 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -225,7 +225,7 @@ void __destroy_inode(struct inode *inode)
        inode_detach_wb(inode);
        security_inode_free(inode);
        fsnotify_inode_delete(inode);
-       locks_free_lock_context(inode->i_flctx);
+       locks_free_lock_context(inode);
        if (!inode->i_nlink) {
                WARN_ON(atomic_long_read(&inode->i_sb->s_remove_count) == 0);
                atomic_long_dec(&inode->i_sb->s_remove_count);
@@ -1883,7 +1883,7 @@ void __init inode_init(void)
                                         sizeof(struct inode),
                                         0,
                                         (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
-                                        SLAB_MEM_SPREAD),
+                                        SLAB_MEM_SPREAD|SLAB_ACCOUNT),
                                         init_once);
 
        /* Hash may have been set up in inode_init_early */