]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
libceph: fix return value check in alloc_msg_with_page_vector()
authorWei Yongjun <weiyj.lk@gmail.com>
Sat, 30 Jul 2016 00:37:57 +0000 (00:37 +0000)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 8 Aug 2016 19:41:41 +0000 (21:41 +0200)
In case of error, the function ceph_alloc_page_vector() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Fixes: 1907920324f1 ('libceph: support for sending notifies')
Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
net/ceph/osd_client.c

index b5ec09612ff71daeb1b95ed4b6f939a172cc7545..a97e7b506612b4255f4b99de76d74c46a1b3896d 100644 (file)
@@ -4220,7 +4220,7 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr)
 
                pages = ceph_alloc_page_vector(calc_pages_for(0, data_len),
                                               GFP_NOIO);
-               if (!pages) {
+               if (IS_ERR(pages)) {
                        ceph_msg_put(m);
                        return NULL;
                }