diff options
author | 2021-11-07 17:38:36 +0100 | |
---|---|---|
committer | 2021-11-07 17:38:36 +0100 | |
commit | e269d7caf9e0dbd95fac9991991298f74930c2c0 (patch) | |
tree | 5fc1a69a0a54cdfc7f3a0be247f6658d3d7ed3c1 /fs/inode.c | |
parent | Merge tag 'nand/for-5.16' into mtd/next (diff) | |
parent | mtd: spi-nor: nxp-spifi: Make use of the helper function devm_platform_ioremap_resource_byname() (diff) | |
download | wireguard-linux-e269d7caf9e0dbd95fac9991991298f74930c2c0.tar.xz wireguard-linux-e269d7caf9e0dbd95fac9991991298f74930c2c0.zip |
Merge tag 'spi-nor/for-5.16' into mtd/next
SPI NOR core changes:
- Add spi-nor device tree binding under SPI NOR maintainers
SPI NOR manufacturer drivers changes:
- Enable locking for n25q128a13
SPI NOR controller drivers changes:
- Use devm_platform_ioremap_resource_byname()
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c index 37710ca863b5..ed0cab8a32db 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -190,8 +190,10 @@ int inode_init_always(struct super_block *sb, struct inode *inode) mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); mapping->private_data = NULL; mapping->writeback_index = 0; - __init_rwsem(&mapping->invalidate_lock, "mapping.invalidate_lock", - &sb->s_type->invalidate_lock_key); + init_rwsem(&mapping->invalidate_lock); + lockdep_set_class_and_name(&mapping->invalidate_lock, + &sb->s_type->invalidate_lock_key, + "mapping.invalidate_lock"); inode->i_private = NULL; inode->i_mapping = mapping; INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */ |