diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-02-09 17:50:15 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-03-25 18:51:43 +0100 |
| commit | 3f1af42ad0fad8a12242233dd0d9fc42f5e83415 (patch) | |
| tree | eabe7d5ed3f48fb23c2caa777a4436df67103b29 /drivers | |
| parent | 9e767adbd3961760af5d56efe45fa8217cce7db6 (diff) | |
| download | linux-stable-3f1af42ad0fad8a12242233dd0d9fc42f5e83415.tar.gz linux-stable-3f1af42ad0fad8a12242233dd0d9fc42f5e83415.tar.bz2 linux-stable-3f1af42ad0fad8a12242233dd0d9fc42f5e83415.zip | |
libceph: enable large, variable-sized OSD requests
Turn r_ops into a flexible array member to enable large, consisting of
up to 16 ops, OSD requests. The use case is scattered writeback in
cephfs and, as far as the kernel client is concerned, 16 is just a made
up number.
r_ops had size 3 for copyup+hint+write, but copyup is really a special
case - it can only happen once. ceph_osd_request_cache is therefore
stuffed with num_ops=2 requests, anything bigger than that is allocated
with kmalloc(). req_mempool is backed by ceph_osd_request_cache, which
means either num_ops=1 or num_ops=2 for use_mempool=true - all existing
users (ceph_writepages_start(), ceph_osdc_writepages()) are fine with
that.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/rbd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 94f31bde73e8..08018710f363 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1847,8 +1847,6 @@ static void rbd_osd_req_callback(struct ceph_osd_request *osd_req, if (osd_req->r_result < 0) obj_request->result = osd_req->r_result; - rbd_assert(osd_req->r_num_ops <= CEPH_OSD_MAX_OP); - /* * We support a 64-bit length, but ultimately it has to be * passed to the block layer, which just supports a 32-bit |