diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ceph/osd_client.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 77ce1edaa07d..bdc3bb12bfd5 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -174,9 +174,7 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, | |||
174 | struct ceph_snap_context *snapc, | 174 | struct ceph_snap_context *snapc, |
175 | struct ceph_osd_req_op *ops, | 175 | struct ceph_osd_req_op *ops, |
176 | bool use_mempool, | 176 | bool use_mempool, |
177 | gfp_t gfp_flags, | 177 | gfp_t gfp_flags) |
178 | struct page **pages, | ||
179 | struct bio *bio) | ||
180 | { | 178 | { |
181 | struct ceph_osd_request *req; | 179 | struct ceph_osd_request *req; |
182 | struct ceph_msg *msg; | 180 | struct ceph_msg *msg; |
@@ -237,13 +235,6 @@ struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc, | |||
237 | memset(msg->front.iov_base, 0, msg->front.iov_len); | 235 | memset(msg->front.iov_base, 0, msg->front.iov_len); |
238 | 236 | ||
239 | req->r_request = msg; | 237 | req->r_request = msg; |
240 | req->r_pages = pages; | ||
241 | #ifdef CONFIG_BLOCK | ||
242 | if (bio) { | ||
243 | req->r_bio = bio; | ||
244 | bio_get(req->r_bio); | ||
245 | } | ||
246 | #endif | ||
247 | 238 | ||
248 | return req; | 239 | return req; |
249 | } | 240 | } |
@@ -439,9 +430,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, | |||
439 | } else | 430 | } else |
440 | ops[1].op = 0; | 431 | ops[1].op = 0; |
441 | 432 | ||
442 | req = ceph_osdc_alloc_request(osdc, snapc, ops, | 433 | req = ceph_osdc_alloc_request(osdc, snapc, ops, use_mempool, GFP_NOFS); |
443 | use_mempool, | ||
444 | GFP_NOFS, NULL, NULL); | ||
445 | if (!req) | 434 | if (!req) |
446 | return ERR_PTR(-ENOMEM); | 435 | return ERR_PTR(-ENOMEM); |
447 | req->r_flags = flags; | 436 | req->r_flags = flags; |