Commit 35adffed authored by Aurelien Aptel's avatar Aurelien Aptel Committed by Steve French

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: default avatarAurelien Aptel <aaptel@suse.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent fa9c2362
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/falloc.h> #include <linux/falloc.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/uuid.h> #include <linux/uuid.h>
#include <linux/sort.h>
#include <crypto/aead.h> #include <crypto/aead.h>
#include "cifsglob.h" #include "cifsglob.h"
#include "smb2pdu.h" #include "smb2pdu.h"
...@@ -552,6 +553,13 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, ...@@ -552,6 +553,13 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf,
return rc; 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 static int
SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) 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) ...@@ -581,6 +589,9 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon)
if (rc) if (rc)
goto out; goto out;
/* sort interfaces from fastest to slowest */
sort(iface_list, iface_count, sizeof(*iface_list), compare_iface, NULL);
spin_lock(&ses->iface_lock); spin_lock(&ses->iface_lock);
kfree(ses->iface_list); kfree(ses->iface_list);
ses->iface_list = iface_list; ses->iface_list = iface_list;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment