io_uring: don't enter poll loop if we have CQEs pending

[linux.git] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index 8fd7d3b9a1b1fa3c34542d2e3cf5eb24e6843b17..dd3c55c9101c4e8475eca6a66e789a5f991d845d 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -191,11 +191,13 @@ void afs_put_read(struct afs_read *req)
        int i;
 
        if (refcount_dec_and_test(&req->usage)) {
-               for (i = 0; i < req->nr_pages; i++)
-                       if (req->pages[i])
-                               put_page(req->pages[i]);
-               if (req->pages != req->array)
-                       kfree(req->pages);
+               if (req->pages) {
+                       for (i = 0; i < req->nr_pages; i++)
+                               if (req->pages[i])
+                                       put_page(req->pages[i]);
+                       if (req->pages != req->array)
+                               kfree(req->pages);
+               }
                kfree(req);
        }
 }
@@ -310,8 +312,7 @@ int afs_page_filler(void *data, struct page *page)
                /* fall through */
        default:
        go_on:
-               req = kzalloc(sizeof(struct afs_read) + sizeof(struct page *),
-                             GFP_KERNEL);
+               req = kzalloc(struct_size(req, array, 1), GFP_KERNEL);
                if (!req)
                        goto enomem;
 
@@ -461,8 +462,7 @@ static int afs_readpages_one(struct file *file, struct address_space *mapping,
                n++;
        }
 
-       req = kzalloc(sizeof(struct afs_read) + sizeof(struct page *) * n,
-                     GFP_NOFS);
+       req = kzalloc(struct_size(req, array, n), GFP_NOFS);
        if (!req)
                return -ENOMEM;