ksmbd: replace usage of found with dedicated list iterator variable

[ Upstream commit edf5f0548fbb77e20b898460dc25281b0f4d974d ]

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 [1].

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/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
Reviewed-by: Hyunchul Lee <hyc.lee@gmail.com>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 6440e78b1be95f95b68c51952eb5ad52d0bc8075..ee58f6c2d09ec42dea2af01400ad37839c852023 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -6691,8 +6691,7 @@ int smb2_cancel(struct ksmbd_work *work)
        struct ksmbd_conn *conn = work->conn;
        struct smb2_hdr *hdr = smb2_get_msg(work->request_buf);
        struct smb2_hdr *chdr;
-       struct ksmbd_work *cancel_work = NULL;
-       int canceled = 0;
+       struct ksmbd_work *cancel_work = NULL, *iter;
        struct list_head *command_list;
 
        ksmbd_debug(SMB, "smb2 cancel called on mid %llu, async flags 0x%x\n",
@@ -6702,11 +6701,11 @@ int smb2_cancel(struct ksmbd_work *work)
                command_list = &conn->async_requests;
 
                spin_lock(&conn->request_lock);
-               list_for_each_entry(cancel_work, command_list,
+               list_for_each_entry(iter, command_list,
                                    async_request_entry) {
-                       chdr = smb2_get_msg(cancel_work->request_buf);
+                       chdr = smb2_get_msg(iter->request_buf);
 
-                       if (cancel_work->async_id !=
+                       if (iter->async_id !=
                            le64_to_cpu(hdr->Id.AsyncId))
                                continue;
 
@@ -6714,7 +6713,7 @@ int smb2_cancel(struct ksmbd_work *work)
                                    "smb2 with AsyncId %llu cancelled command = 0x%x\n",
                                    le64_to_cpu(hdr->Id.AsyncId),
                                    le16_to_cpu(chdr->Command));
-                       canceled = 1;
+                       cancel_work = iter;
                        break;
                }
                spin_unlock(&conn->request_lock);
@@ -6722,24 +6721,24 @@ int smb2_cancel(struct ksmbd_work *work)
                command_list = &conn->requests;
 
                spin_lock(&conn->request_lock);
-               list_for_each_entry(cancel_work, command_list, request_entry) {
-                       chdr = smb2_get_msg(cancel_work->request_buf);
+               list_for_each_entry(iter, command_list, request_entry) {
+                       chdr = smb2_get_msg(iter->request_buf);
 
                        if (chdr->MessageId != hdr->MessageId ||
-                           cancel_work == work)
+                           iter == work)
                                continue;
 
                        ksmbd_debug(SMB,
                                    "smb2 with mid %llu cancelled command = 0x%x\n",
                                    le64_to_cpu(hdr->MessageId),
                                    le16_to_cpu(chdr->Command));
-                       canceled = 1;
+                       cancel_work = iter;
                        break;
                }
                spin_unlock(&conn->request_lock);
        }
 
-       if (canceled) {
+       if (cancel_work) {
                cancel_work->state = KSMBD_WORK_CANCELLED;
                if (cancel_work->cancel_fn)
                        cancel_work->cancel_fn(cancel_work->cancel_argv);