From patchwork Thu Jun 17 17:36:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1493771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G5Tl241HTz9sWM; Fri, 18 Jun 2021 03:37:02 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ltvwo-0004fV-0s; Thu, 17 Jun 2021 17:36:58 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ltvwl-0004dx-U1 for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2021 17:36:55 +0000 Received: from mail-pl1-f198.google.com ([209.85.214.198]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ltvwl-0004ek-Mk for kernel-team@lists.ubuntu.com; Thu, 17 Jun 2021 17:36:55 +0000 Received: by mail-pl1-f198.google.com with SMTP id e19-20020a170902ed93b0290110a7ccff51so2062316plj.20 for ; Thu, 17 Jun 2021 10:36:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=obzt38KR0/IxzMcbS07SzxsM4GaBj7rxjkuHZQQ4eeY=; b=cQFPK3jhHBBsU8oE0jwrxGODtCwaZn4hpwleXOaVNyVdasEOdQLxMNWTDV59qU58dQ E7EL3QHKe97YboLqeVQ42pYEvpbIgyymqQ+uRxNVkV852f2N85nXndqTgXq+IBLTxwuh w28tk/uK/3YZtmADt1qtkJUZqfStLtKdFQcSmZmg79vQxz5s1aLCaz2fP1U4cXiyRxvk A3jWCNRDJpahANVZ1ebg+xI51KRbKdSH0+fdArWvvrQM0ZEuqZTzt3AokxjaSq7/hmwc 24mETZSjl7IgeDetad82rj0Njs2/PksLtPLga2qmJOtJCtidHWIsh43W9OvejqMGsaSD HNRA== X-Gm-Message-State: AOAM530RRURCLMvMhfIDMTwUh14QDHf4eMg6dhek3Gkgm104pro/Vz+P NE0eKwzPg7CW9RMcHe9r7wx4HpX2cSz8/666dkBe6Avg6iJSnis/TZWYv4tm50ZoxFa3eH6Br6P hcyYGZE9/cERwKVfNaCMkQqidf2NlDx1OXV1k2PkOKA== X-Received: by 2002:a17:902:bf44:b029:11e:5454:26c0 with SMTP id u4-20020a170902bf44b029011e545426c0mr922330pls.2.1623951414038; Thu, 17 Jun 2021 10:36:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8TnYLfmijmco/EqMLeNMvPkB/sJEnvSgUNHjmakMv9Q3nlcmTuq5e+r58jd9E3CPN0g3rCQ== X-Received: by 2002:a17:902:bf44:b029:11e:5454:26c0 with SMTP id u4-20020a170902bf44b029011e545426c0mr922323pls.2.1623951413849; Thu, 17 Jun 2021 10:36:53 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id e2sm5725821pfc.135.2021.06.17.10.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:36:53 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4][groovy:linux] cifs: rename reconn_inval_dfs_target() Date: Thu, 17 Jun 2021 11:36:42 -0600 Message-Id: <20210617173645.25868-6-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210617173645.25868-1-tim.gardner@canonical.com> References: <20210617173645.25868-1-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Paulo Alcantara BugLink: https://bugs.launchpad.net/bugs/1929831 This function has nothing to do with *invalidation* but setting up the next target server from a cached referral. Rename it to reconn_set_next_dfs_target(). While at it, get rid of some meaningless checks. Signed-off-by: Paulo Alcantara (SUSE) Reviewed-by: Aurelien Aptel Signed-off-by: Steve French (cherry picked from commit 7d397a034d5c45528c7bdf7fc3752c4793029cce) Signed-off-by: Tim Gardner --- fs/cifs/connect.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8f62875498a0..3ec356c3b0b5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -396,15 +396,14 @@ static inline int reconn_set_ipaddr(struct TCP_Server_Info *server) #ifdef CONFIG_CIFS_DFS_UPCALL /* These functions must be called with server->srv_mutex held */ -static void reconn_inval_dfs_target(struct TCP_Server_Info *server, - struct cifs_sb_info *cifs_sb, - struct dfs_cache_tgt_list *tgt_list, - struct dfs_cache_tgt_iterator **tgt_it) +static void reconn_set_next_dfs_target(struct TCP_Server_Info *server, + struct cifs_sb_info *cifs_sb, + struct dfs_cache_tgt_list *tgt_list, + struct dfs_cache_tgt_iterator **tgt_it) { const char *name; - if (!cifs_sb || !cifs_sb->origin_fullpath || !tgt_list || - !server->nr_targets) + if (!cifs_sb || !cifs_sb->origin_fullpath) return; if (!*tgt_it) { @@ -581,7 +580,7 @@ cifs_reconnect(struct TCP_Server_Info *server) * feature is disabled, then we will retry last server we * connected to before. */ - reconn_inval_dfs_target(server, cifs_sb, &tgt_list, &tgt_it); + reconn_set_next_dfs_target(server, cifs_sb, &tgt_list, &tgt_it); #endif rc = reconn_set_ipaddr(server); if (rc) {