diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/ceph/osd_client.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index b5ec09612ff7..a97e7b506612 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
| @@ -4220,7 +4220,7 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr) | |||
| 4220 | 4220 | ||
| 4221 | pages = ceph_alloc_page_vector(calc_pages_for(0, data_len), | 4221 | pages = ceph_alloc_page_vector(calc_pages_for(0, data_len), |
| 4222 | GFP_NOIO); | 4222 | GFP_NOIO); |
| 4223 | if (!pages) { | 4223 | if (IS_ERR(pages)) { |
| 4224 | ceph_msg_put(m); | 4224 | ceph_msg_put(m); |
| 4225 | return NULL; | 4225 | return NULL; |
| 4226 | } | 4226 | } |