cifs: sort interface list by speed

New channels are going to be opened by walking the list sequentially,
so by sorting it we will connect to the fastest interfaces first.

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index eb92cd4502cc035b05dbe4f63279740e44dadb44..3b0f6cda9a871f0bcc2407e1bcb7436fc65e1e19 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -10,6 +10,7 @@
 #include <linux/falloc.h>
 #include <linux/scatterlist.h>
 #include <linux/uuid.h>
+#include <linux/sort.h>
 #include <crypto/aead.h>
 #include "cifsglob.h"
 #include "smb2pdu.h"
@@ -552,6 +553,13 @@ out:
        return rc;
 }
 
+static int compare_iface(const void *ia, const void *ib)
+{
+       const struct cifs_server_iface *a = (struct cifs_server_iface *)ia;
+       const struct cifs_server_iface *b = (struct cifs_server_iface *)ib;
+
+       return a->speed == b->speed ? 0 : (a->speed > b->speed ? -1 : 1);
+}
 
 static int
 SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
@@ -581,6 +589,9 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
        if (rc)
                goto out;
 
+       /* sort interfaces from fastest to slowest */
+       sort(iface_list, iface_count, sizeof(*iface_list), compare_iface, NULL);
+
        spin_lock(&ses->iface_lock);
        kfree(ses->iface_list);
        ses->iface_list = iface_list;