aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds/message.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/rds/message.c')
-rw-r--r--net/rds/message.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rds/message.c b/net/rds/message.c
index 9a1d67e001ba..809656c2b25c 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -240,7 +240,7 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
240 unsigned int i; 240 unsigned int i;
241 241
242 rm = rds_message_alloc(ceil(total_len, PAGE_SIZE), GFP_KERNEL); 242 rm = rds_message_alloc(ceil(total_len, PAGE_SIZE), GFP_KERNEL);
243 if (rm == NULL) 243 if (!rm)
244 return ERR_PTR(-ENOMEM); 244 return ERR_PTR(-ENOMEM);
245 245
246 set_bit(RDS_MSG_PAGEVEC, &rm->m_flags); 246 set_bit(RDS_MSG_PAGEVEC, &rm->m_flags);
@@ -284,7 +284,7 @@ struct rds_message *rds_message_copy_from_user(struct iovec *first_iov,
284 sg_off = 0; /* Dear gcc, sg->page will be null from kzalloc. */ 284 sg_off = 0; /* Dear gcc, sg->page will be null from kzalloc. */
285 285
286 while (total_len) { 286 while (total_len) {
287 if (sg_page(sg) == NULL) { 287 if (!sg_page(sg)) {
288 ret = rds_page_remainder_alloc(sg, total_len, 288 ret = rds_page_remainder_alloc(sg, total_len,
289 GFP_HIGHUSER); 289 GFP_HIGHUSER);
290 if (ret) 290 if (ret)