diff options
| author | Fabio M. De Francesco <fmdefrancesco@gmail.com> | 2022-05-31 16:53:33 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-07-25 17:45:33 +0200 |
| commit | 70826b6bd583a8e766ffec8415cc7d5395836370 (patch) | |
| tree | 298e494c0f1d10008a47ec68b7592d90593be396 | |
| parent | 9ff7ddd3c7ad7f6537cd66d3f455c7717bd358b9 (diff) | |
| download | lwn-70826b6bd583a8e766ffec8415cc7d5395836370.tar.gz lwn-70826b6bd583a8e766ffec8415cc7d5395836370.zip | |
btrfs: replace kmap() with kmap_local_page() in inode.c
The use of kmap() is being deprecated in favor of kmap_local_page() where
it is feasible. With kmap_local_page(), the mapping is per thread, CPU
local and not globally visible.
Therefore, use kmap_local_page() / kunmap_local() in inode.c wherever the
mappings are per thread and not globally visible.
Tested on QEMU + KVM 32 bits VM with 4GB of RAM and HIGHMEM64G enabled.
Suggested-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 9cce0a3228f8..92dca0e0d207 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10760,15 +10760,15 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, ret = -ENOMEM; goto out_pages; } - kaddr = kmap(pages[i]); + kaddr = kmap_local_page(pages[i]); if (copy_from_iter(kaddr, bytes, from) != bytes) { - kunmap(pages[i]); + kunmap_local(kaddr); ret = -EFAULT; goto out_pages; } if (bytes < PAGE_SIZE) memset(kaddr + bytes, 0, PAGE_SIZE - bytes); - kunmap(pages[i]); + kunmap_local(kaddr); } for (;;) { |