.. | .. |
---|
205 | 205 | int ret; |
---|
206 | 206 | |
---|
207 | 207 | spin_lock(lock); |
---|
208 | | - if (prev->bh && blkoff == prev->blkoff) { |
---|
| 208 | + if (prev->bh && blkoff == prev->blkoff && |
---|
| 209 | + likely(buffer_uptodate(prev->bh))) { |
---|
209 | 210 | get_bh(prev->bh); |
---|
210 | 211 | *bhp = prev->bh; |
---|
211 | 212 | spin_unlock(lock); |
---|
.. | .. |
---|
613 | 614 | lock = nilfs_mdt_bgl_lock(inode, group); |
---|
614 | 615 | |
---|
615 | 616 | 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); |
---|
620 | 621 | else |
---|
621 | 622 | nilfs_palloc_group_desc_add_entries(desc, lock, 1); |
---|
622 | 623 | |
---|
.. | .. |
---|
654 | 655 | lock = nilfs_mdt_bgl_lock(inode, group); |
---|
655 | 656 | |
---|
656 | 657 | 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); |
---|
661 | 662 | else |
---|
662 | 663 | nilfs_palloc_group_desc_add_entries(desc, lock, 1); |
---|
663 | 664 | |
---|
.. | .. |
---|
763 | 764 | do { |
---|
764 | 765 | if (!nilfs_clear_bit_atomic(lock, group_offset, |
---|
765 | 766 | 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]); |
---|
770 | 771 | } else { |
---|
771 | 772 | n++; |
---|
772 | 773 | } |
---|
.. | .. |
---|
808 | 809 | ret = nilfs_palloc_delete_entry_block(inode, |
---|
809 | 810 | last_nrs[k]); |
---|
810 | 811 | 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); |
---|
815 | 816 | } |
---|
816 | 817 | |
---|
817 | 818 | desc_kaddr = kmap_atomic(desc_bh->b_page); |
---|
.. | .. |
---|
826 | 827 | if (nfree == nilfs_palloc_entries_per_group(inode)) { |
---|
827 | 828 | ret = nilfs_palloc_delete_bitmap_block(inode, group); |
---|
828 | 829 | 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); |
---|
832 | 833 | } |
---|
833 | 834 | } |
---|
834 | 835 | return 0; |
---|