Commit ca91659
committed
Merge tag 'ceph-for-4.14-rc9' of git://github.com/ceph/ceph-client
Pull ceph gix from Ilya Dryomov:
"Memory allocation flags fix, marked for stable"
* tag 'ceph-for-4.14-rc9' of git://github.com/ceph/ceph-client:
rbd: use GFP_NOIO for parent stat and data requests1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2692 | 2692 | | |
2693 | 2693 | | |
2694 | 2694 | | |
2695 | | - | |
| 2695 | + | |
2696 | 2696 | | |
2697 | 2697 | | |
2698 | 2698 | | |
| |||
2827 | 2827 | | |
2828 | 2828 | | |
2829 | 2829 | | |
2830 | | - | |
| 2830 | + | |
2831 | 2831 | | |
2832 | 2832 | | |
2833 | 2833 | | |
| |||
0 commit comments