]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cifs: update iface_last_update on each query-and-update
authorShyam Prasad N <sprasad@microsoft.com>
Wed, 3 Jan 2024 12:51:49 +0000 (12:51 +0000)
committerSteve French <stfrench@microsoft.com>
Fri, 19 Jan 2024 16:33:21 +0000 (10:33 -0600)
iface_last_update was an unused field when it was introduced.
Later, when we had periodic update of server interface list,
this field was used regularly to decide when to update next.

However, with the new logic of updating the interfaces, it
becomes crucial that this field be updated whenever
parse_server_interfaces runs successfully.

This change updates this field when either the server does
not support query of interfaces; so that we do not query
the interfaces repeatedly. It also updates the field when
the function reaches the end.

Fixes: aa45dadd34e4 ("cifs: change iface_list from array to sorted linked list")
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
fs/smb/client/smb2ops.c

index f080fac1b26ee215bd4905d9e5b1197ab905dae4..d9553c2556a290dcea14434e00df9d854e713aa3 100644 (file)
@@ -615,6 +615,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
                                 "Empty network interface list returned by server %s\n",
                                 ses->server->hostname);
                rc = -EOPNOTSUPP;
+               ses->iface_last_update = jiffies;
                goto out;
        }
 
@@ -712,7 +713,6 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
 
                ses->iface_count++;
                spin_unlock(&ses->iface_lock);
-               ses->iface_last_update = jiffies;
 next_iface:
                nb_iface++;
                next = le32_to_cpu(p->Next);
@@ -734,6 +734,8 @@ next_iface:
        if ((bytes_left > 8) || p->Next)
                cifs_dbg(VFS, "%s: incomplete interface info\n", __func__);
 
+       ses->iface_last_update = jiffies;
+
 out:
        /*
         * Go through the list again and put the inactive entries