.. | .. |
---|
476 | 476 | err = ext_tree_remove(bl, true, 0, LLONG_MAX); |
---|
477 | 477 | WARN_ON(err); |
---|
478 | 478 | |
---|
479 | | - kfree(bl); |
---|
| 479 | + kfree_rcu(bl, bl_layout.plh_rcu); |
---|
480 | 480 | } |
---|
481 | 481 | |
---|
482 | 482 | static struct pnfs_layout_hdr *__bl_alloc_layout_hdr(struct inode *inode, |
---|
.. | .. |
---|
584 | 584 | |
---|
585 | 585 | static struct nfs4_deviceid_node * |
---|
586 | 586 | bl_find_get_deviceid(struct nfs_server *server, |
---|
587 | | - const struct nfs4_deviceid *id, struct rpc_cred *cred, |
---|
| 587 | + const struct nfs4_deviceid *id, const struct cred *cred, |
---|
588 | 588 | gfp_t gfp_mask) |
---|
589 | 589 | { |
---|
590 | 590 | struct nfs4_deviceid_node *node; |
---|
.. | .. |
---|
753 | 753 | case -ENODEV: |
---|
754 | 754 | /* Our extent block devices are unavailable */ |
---|
755 | 755 | set_bit(NFS_LSEG_UNAVAILABLE, &lseg->pls_flags); |
---|
756 | | - /* Fall through */ |
---|
| 756 | + fallthrough; |
---|
757 | 757 | case 0: |
---|
758 | 758 | return lseg; |
---|
759 | 759 | default: |
---|
.. | .. |
---|
896 | 896 | end = DIV_ROUND_UP(i_size_read(inode), PAGE_SIZE); |
---|
897 | 897 | if (end != inode->i_mapping->nrpages) { |
---|
898 | 898 | rcu_read_lock(); |
---|
899 | | - end = page_cache_next_hole(mapping, idx + 1, ULONG_MAX); |
---|
| 899 | + end = page_cache_next_miss(mapping, idx + 1, ULONG_MAX); |
---|
900 | 900 | rcu_read_unlock(); |
---|
901 | 901 | } |
---|
902 | 902 | |
---|