From patchwork Thu May 27 14:49:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1484686 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 4FrW1M4gCBz9sTD; Fri, 28 May 2021 00:49:27 +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 1lmHK8-0005ex-Ro; Thu, 27 May 2021 14:49:24 +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 1lmHK5-0005dm-M7 for kernel-team@lists.ubuntu.com; Thu, 27 May 2021 14:49:21 +0000 Received: from mail-pj1-f71.google.com ([209.85.216.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lmHK5-0004UB-EO for kernel-team@lists.ubuntu.com; Thu, 27 May 2021 14:49:21 +0000 Received: by mail-pj1-f71.google.com with SMTP id a11-20020a17090a70cbb029015d3e996884so2736244pjm.4 for ; Thu, 27 May 2021 07:49:21 -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=vOrnr2gXWixDQhJLNxDAxbBegeYlY4lAIzvNY2xCtZY=; b=cdtshh1a9+ATLQ7Ur0lAbl/vB4+0WNz4aKfqvMdSxY7jnKlXlt6s6Q+c6QZumha4Gg pNsV5dYvM0eldy7coEGeqijrSUGvsA47IP3RbGEyEuItF9mGTvQfptVLDfmbUb1uKcWM 85klTNV7QE27BIvesGuz8Ig/NEYqnvFcFUrIakftnp6Gm0FYvTVQvOPf0YhOjaIxV/2b x5cJVJZQJK1kRVOA8hVOxTw3SIcUV1StOUzrVdZOYQtLtLooH3di/toVcQxbTYsNHRCV VingpaSsKKqIvjKW4Zo9d7/Wd0ZUTjihkVIxTHWFbx1qKyrgX6XPoC9/1YJB04MMGoWH 8s3w== X-Gm-Message-State: AOAM533XElU8p6bVjVpqOGqALota/v1CNaWBd/LcjN8KvSh8x63sqR1W ISX2CTdX+7WaYV1FRDnme79v4G1XLVhxnL9EN4NAN/YcFoWmt7+ATIA351KRF3kaQB9G1Vn/8Wh klM75ceGC16Fp58FVwSqCnYlNbzirlFTzn8EV/ycpkA== X-Received: by 2002:a63:ee12:: with SMTP id e18mr4092345pgi.73.1622126959885; Thu, 27 May 2021 07:49:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPwYLOfd2v19ARd7iTd2CrbEVFBKabLphOCGa22/83J5BKv8G/0na/2j/Sv9Vv+Z/a717QXQ== X-Received: by 2002:a63:ee12:: with SMTP id e18mr4092328pgi.73.1622126959697; Thu, 27 May 2021 07:49:19 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id x1sm2058074pjk.37.2021.05.27.07.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 07:49:19 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/4] cifs: rename reconn_inval_dfs_target() Date: Thu, 27 May 2021 08:49:12 -0600 Message-Id: <20210527144915.17079-2-tim.gardner@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210527144915.17079-1-tim.gardner@canonical.com> References: <20210527144915.17079-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 (backported from commit 7d397a034d5c45528c7bdf7fc3752c4793029cce) [rtg minor context adjustmnent] 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 ab9eeb5ff8e57..1746aadf85ef4 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -435,15 +435,14 @@ static inline void put_tcp_super(struct super_block *sb) cifs_sb_deactive(sb); } -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) { @@ -620,7 +619,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) {