aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r--drivers/block/rbd.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index c259b4089e95..b0eea3eaee93 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1890,8 +1890,7 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev,
1890 if (ret < 0) 1890 if (ret < 0)
1891 goto out; 1891 goto out;
1892 ret = 0; 1892 ret = 0;
1893 (void) ceph_copy_from_page_vector(pages, inbound, 0, 1893 ceph_copy_from_page_vector(pages, inbound, 0, obj_request->xferred);
1894 obj_request->xferred);
1895 if (version) 1894 if (version)
1896 *version = obj_request->version; 1895 *version = obj_request->version;
1897out: 1896out:
@@ -2089,7 +2088,7 @@ static int rbd_obj_read_sync(struct rbd_device *rbd_dev,
2089 2088
2090 rbd_assert(obj_request->xferred <= (u64) SIZE_MAX); 2089 rbd_assert(obj_request->xferred <= (u64) SIZE_MAX);
2091 size = (size_t) obj_request->xferred; 2090 size = (size_t) obj_request->xferred;
2092 (void) ceph_copy_from_page_vector(pages, buf, 0, size); 2091 ceph_copy_from_page_vector(pages, buf, 0, size);
2093 rbd_assert(size <= (size_t) INT_MAX); 2092 rbd_assert(size <= (size_t) INT_MAX);
2094 ret = (int) size; 2093 ret = (int) size;
2095 if (version) 2094 if (version)