]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
IB/SA: Replace usage of found with dedicated list iterator variable
authorJakob Koschel <jakobkoschel@gmail.com>
Thu, 31 Mar 2022 09:16:34 +0000 (11:16 +0200)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 8 Apr 2022 16:53:22 +0000 (13:53 -0300)
To move the list iterator variable into the list_for_each_entry_*() macro
in the future it should be avoided to use the list iterator variable after
the loop body.

To *never* use the list iterator variable after the loop it was concluded
to use a separate iterator variable instead of a found boolean.

This removes the need to use a found variable and simply checking if the
variable was set, can determine if the break/goto was hit.

Link: https://lore.kernel.org/r/20220331091634.644840-1-jakobkoschel@gmail.com
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/core/sa_query.c

index 8dc7d1f4b35dcdf6b74432a2ccf8c61cfadec742..003e504feca2ac56ba890f2b802f317643a401be 100644 (file)
@@ -1034,10 +1034,9 @@ int ib_nl_handle_resolve_resp(struct sk_buff *skb,
                              struct netlink_ext_ack *extack)
 {
        unsigned long flags;
-       struct ib_sa_query *query;
+       struct ib_sa_query *query = NULL, *iter;
        struct ib_mad_send_buf *send_buf;
        struct ib_mad_send_wc mad_send_wc;
-       int found = 0;
        int ret;
 
        if ((nlh->nlmsg_flags & NLM_F_REQUEST) ||
@@ -1045,20 +1044,21 @@ int ib_nl_handle_resolve_resp(struct sk_buff *skb,
                return -EPERM;
 
        spin_lock_irqsave(&ib_nl_request_lock, flags);
-       list_for_each_entry(query, &ib_nl_request_list, list) {
+       list_for_each_entry(iter, &ib_nl_request_list, list) {
                /*
                 * If the query is cancelled, let the timeout routine
                 * take care of it.
                 */
-               if (nlh->nlmsg_seq == query->seq) {
-                       found = !ib_sa_query_cancelled(query);
-                       if (found)
-                               list_del(&query->list);
+               if (nlh->nlmsg_seq == iter->seq) {
+                       if (!ib_sa_query_cancelled(iter)) {
+                               list_del(&iter->list);
+                               query = iter;
+                       }
                        break;
                }
        }
 
-       if (!found) {
+       if (!query) {
                spin_unlock_irqrestore(&ib_nl_request_lock, flags);
                goto resp_out;
        }