projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'libata-5.15-2021-09-11' of git://git.kernel.dk/linux-block
[linux-2.6-microblaze.git]
/
fs
/
inode.c
diff --git
a/fs/inode.c
b/fs/inode.c
index
c93500d
..
37710ca
100644
(file)
--- a/
fs/inode.c
+++ b/
fs/inode.c
@@
-190,6
+190,8
@@
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;
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);
inode->i_private = NULL;
inode->i_mapping = mapping;
INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */
inode->i_private = NULL;
inode->i_mapping = mapping;
INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */
@@
-768,7
+770,7
@@
static enum lru_status inode_lru_isolate(struct list_head *item,
return LRU_ROTATE;
}
return LRU_ROTATE;
}
- if (inode_has_buffers(inode) ||
inode->i_data.nrpages
) {
+ if (inode_has_buffers(inode) ||
!mapping_empty(&inode->i_data)
) {
__iget(inode);
spin_unlock(&inode->i_lock);
spin_unlock(lru_lock);
__iget(inode);
spin_unlock(&inode->i_lock);
spin_unlock(lru_lock);