diff options
| -rw-r--r-- | drivers/block/rbd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e95a92e89330..afbc9f6f8ff1 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
| @@ -1840,12 +1840,11 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev, | |||
| 1840 | int ret; | 1840 | int ret; |
| 1841 | 1841 | ||
| 1842 | /* | 1842 | /* |
| 1843 | * Method calls are ultimately read operations but they | 1843 | * Method calls are ultimately read operations. The result |
| 1844 | * don't involve object data (so no offset or length). | 1844 | * should placed into the inbound buffer provided. They |
| 1845 | * The result should placed into the inbound buffer | 1845 | * also supply outbound data--parameters for the object |
| 1846 | * provided. They also supply outbound data--parameters for | 1846 | * method. Currently if this is present it will be a |
| 1847 | * the object method. Currently if this is present it will | 1847 | * snapshot id. |
| 1848 | * be a snapshot id. | ||
| 1849 | */ | 1848 | */ |
| 1850 | page_count = (u32) calc_pages_for(0, inbound_size); | 1849 | page_count = (u32) calc_pages_for(0, inbound_size); |
| 1851 | pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); | 1850 | pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); |
| @@ -1853,7 +1852,7 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev, | |||
| 1853 | return PTR_ERR(pages); | 1852 | return PTR_ERR(pages); |
| 1854 | 1853 | ||
| 1855 | ret = -ENOMEM; | 1854 | ret = -ENOMEM; |
| 1856 | obj_request = rbd_obj_request_create(object_name, 0, 0, | 1855 | obj_request = rbd_obj_request_create(object_name, 0, inbound_size, |
| 1857 | OBJ_REQUEST_PAGES); | 1856 | OBJ_REQUEST_PAGES); |
| 1858 | if (!obj_request) | 1857 | if (!obj_request) |
| 1859 | goto out; | 1858 | goto out; |
