hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/fs/nilfs2/alloc.c
....@@ -205,7 +205,8 @@
205205 int ret;
206206
207207 spin_lock(lock);
208
- if (prev->bh && blkoff == prev->blkoff) {
208
+ if (prev->bh && blkoff == prev->blkoff &&
209
+ likely(buffer_uptodate(prev->bh))) {
209210 get_bh(prev->bh);
210211 *bhp = prev->bh;
211212 spin_unlock(lock);
....@@ -613,10 +614,10 @@
613614 lock = nilfs_mdt_bgl_lock(inode, group);
614615
615616 if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
616
- nilfs_msg(inode->i_sb, KERN_WARNING,
617
- "%s (ino=%lu): entry number %llu already freed",
618
- __func__, inode->i_ino,
619
- (unsigned long long)req->pr_entry_nr);
617
+ nilfs_warn(inode->i_sb,
618
+ "%s (ino=%lu): entry number %llu already freed",
619
+ __func__, inode->i_ino,
620
+ (unsigned long long)req->pr_entry_nr);
620621 else
621622 nilfs_palloc_group_desc_add_entries(desc, lock, 1);
622623
....@@ -654,10 +655,10 @@
654655 lock = nilfs_mdt_bgl_lock(inode, group);
655656
656657 if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap))
657
- nilfs_msg(inode->i_sb, KERN_WARNING,
658
- "%s (ino=%lu): entry number %llu already freed",
659
- __func__, inode->i_ino,
660
- (unsigned long long)req->pr_entry_nr);
658
+ nilfs_warn(inode->i_sb,
659
+ "%s (ino=%lu): entry number %llu already freed",
660
+ __func__, inode->i_ino,
661
+ (unsigned long long)req->pr_entry_nr);
661662 else
662663 nilfs_palloc_group_desc_add_entries(desc, lock, 1);
663664
....@@ -763,10 +764,10 @@
763764 do {
764765 if (!nilfs_clear_bit_atomic(lock, group_offset,
765766 bitmap)) {
766
- nilfs_msg(inode->i_sb, KERN_WARNING,
767
- "%s (ino=%lu): entry number %llu already freed",
768
- __func__, inode->i_ino,
769
- (unsigned long long)entry_nrs[j]);
767
+ nilfs_warn(inode->i_sb,
768
+ "%s (ino=%lu): entry number %llu already freed",
769
+ __func__, inode->i_ino,
770
+ (unsigned long long)entry_nrs[j]);
770771 } else {
771772 n++;
772773 }
....@@ -808,10 +809,10 @@
808809 ret = nilfs_palloc_delete_entry_block(inode,
809810 last_nrs[k]);
810811 if (ret && ret != -ENOENT)
811
- nilfs_msg(inode->i_sb, KERN_WARNING,
812
- "error %d deleting block that object (entry=%llu, ino=%lu) belongs to",
813
- ret, (unsigned long long)last_nrs[k],
814
- inode->i_ino);
812
+ nilfs_warn(inode->i_sb,
813
+ "error %d deleting block that object (entry=%llu, ino=%lu) belongs to",
814
+ ret, (unsigned long long)last_nrs[k],
815
+ inode->i_ino);
815816 }
816817
817818 desc_kaddr = kmap_atomic(desc_bh->b_page);
....@@ -826,9 +827,9 @@
826827 if (nfree == nilfs_palloc_entries_per_group(inode)) {
827828 ret = nilfs_palloc_delete_bitmap_block(inode, group);
828829 if (ret && ret != -ENOENT)
829
- nilfs_msg(inode->i_sb, KERN_WARNING,
830
- "error %d deleting bitmap block of group=%lu, ino=%lu",
831
- ret, group, inode->i_ino);
830
+ nilfs_warn(inode->i_sb,
831
+ "error %d deleting bitmap block of group=%lu, ino=%lu",
832
+ ret, group, inode->i_ino);
832833 }
833834 }
834835 return 0;