cifs: Simplify reconnect code when dfs upcall is enabled

Some witness notifications, like client move, tell the client to
reconnect to a specific IP address. In this situation the DFS failover
code path has to be skipped so clean up as much as possible the
cifs_reconnect() code.

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 584eddbbbb36e9180661769c5f9a60a3957b6829..156c18bf40d2e1a082f6b10604fb0420308f4154 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -88,7 +88,7 @@ static void cifs_prune_tlinks(struct work_struct *work);
  * This should be called with server->srv_mutex held.
  */
 #ifdef CONFIG_CIFS_DFS_UPCALL
-static int reconn_set_ipaddr(struct TCP_Server_Info *server)
+static int reconn_set_ipaddr_from_hostname(struct TCP_Server_Info *server)
 {
        int rc;
        int len;
@@ -123,14 +123,7 @@ static int reconn_set_ipaddr(struct TCP_Server_Info *server)
 
        return !rc ? -1 : 0;
 }
-#else
-static inline int reconn_set_ipaddr(struct TCP_Server_Info *server)
-{
-       return 0;
-}
-#endif
 
-#ifdef CONFIG_CIFS_DFS_UPCALL
 /* These functions must be called with server->srv_mutex held */
 static void reconn_set_next_dfs_target(struct TCP_Server_Info *server,
                                       struct cifs_sb_info *cifs_sb,
@@ -138,6 +131,7 @@ static void reconn_set_next_dfs_target(struct TCP_Server_Info *server,
                                       struct dfs_cache_tgt_iterator **tgt_it)
 {
        const char *name;
+       int rc;
 
        if (!cifs_sb || !cifs_sb->origin_fullpath)
                return;
@@ -162,6 +156,12 @@ static void reconn_set_next_dfs_target(struct TCP_Server_Info *server,
                         "%s: failed to extract hostname from target: %ld\n",
                         __func__, PTR_ERR(server->hostname));
        }
+
+       rc = reconn_set_ipaddr_from_hostname(server);
+       if (rc) {
+               cifs_dbg(FYI, "%s: failed to resolve hostname: %d\n",
+                        __func__, rc);
+       }
 }
 
 static inline int reconn_setup_dfs_targets(struct cifs_sb_info *cifs_sb,
@@ -320,11 +320,6 @@ cifs_reconnect(struct TCP_Server_Info *server)
                 */
                reconn_set_next_dfs_target(server, cifs_sb, &tgt_list, &tgt_it);
 #endif
-               rc = reconn_set_ipaddr(server);
-               if (rc) {
-                       cifs_dbg(FYI, "%s: failed to resolve hostname: %d\n",
-                                __func__, rc);
-               }
 
                if (cifs_rdma_enabled(server))
                        rc = smbd_reconnect(server);