Use the bvec_kmap_local helper rather than digging into the bvec
internals.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 drivers/vhost/vringh.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
index 73e153f9b449..f8caa322bafa 100644
--- a/drivers/vhost/vringh.c
+++ b/drivers/vhost/vringh.c
@@ -1291,11 +1291,10 @@ static inline int getu16_iotlb(const struct vringh *vrh,
                if (ret)
                        return ret;
        } else {
-               void *kaddr = kmap_local_page(ivec.iov.bvec[0].bv_page);
-               void *from = kaddr + ivec.iov.bvec[0].bv_offset;
+               __virtio16 *from = bvec_kmap_local(&ivec.iov.bvec[0]);
 
-               tmp = READ_ONCE(*(__virtio16 *)from);
-               kunmap_local(kaddr);
+               tmp = READ_ONCE(*from);
+               kunmap_local(from);
        }
 
        *val = vringh16_to_cpu(vrh, tmp);
@@ -1330,11 +1329,10 @@ static inline int putu16_iotlb(const struct vringh *vrh,
                if (ret)
                        return ret;
        } else {
-               void *kaddr = kmap_local_page(ivec.iov.bvec[0].bv_page);
-               void *to = kaddr + ivec.iov.bvec[0].bv_offset;
+               __virtio16 *to = kmap_local_page(&ivec.iov.bvec[0]);
 
-               WRITE_ONCE(*(__virtio16 *)to, tmp);
-               kunmap_local(kaddr);
+               WRITE_ONCE(*to, tmp);
+               kunmap_local(to);
        }
 
        return 0;
-- 
2.47.2


Reply via email to