tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
"This just fixes a few remaining memory allocations in RBD to use
GFP_NOIO instead of GFP_ATOMIC"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
rbd: use GFP_NOIO consistently for request allocations

Linus Torvalds 1c915b3a d3436a1d

+3 -3
+3 -3
drivers/block/rbd.c
··· 1953 1953 1954 1954 osdc = &rbd_dev->rbd_client->client->osdc; 1955 1955 osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false, 1956 - GFP_ATOMIC); 1956 + GFP_NOIO); 1957 1957 if (!osd_req) 1958 1958 return NULL; /* ENOMEM */ 1959 1959 ··· 2002 2002 rbd_dev = img_request->rbd_dev; 2003 2003 osdc = &rbd_dev->rbd_client->client->osdc; 2004 2004 osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops, 2005 - false, GFP_ATOMIC); 2005 + false, GFP_NOIO); 2006 2006 if (!osd_req) 2007 2007 return NULL; /* ENOMEM */ 2008 2008 ··· 2504 2504 bio_chain_clone_range(&bio_list, 2505 2505 &bio_offset, 2506 2506 clone_size, 2507 - GFP_ATOMIC); 2507 + GFP_NOIO); 2508 2508 if (!obj_request->bio_list) 2509 2509 goto out_unwind; 2510 2510 } else if (type == OBJ_REQUEST_PAGES) {