Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1410480ybp; Thu, 17 Oct 2019 12:22:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZx8Fbd9riNVhRnhDOh+zv5mVsg9G5tAuDA/4/0AJii9hXn9v8k93C2LZa47w/IpY3gzMf X-Received: by 2002:a17:906:3e41:: with SMTP id t1mr5195095eji.103.1571340147101; Thu, 17 Oct 2019 12:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571340147; cv=none; d=google.com; s=arc-20160816; b=Je/AgVAYnshIMo7xwTd2vqrnUPumnUBBualdX2nnbw9anKuJvW58YtekMB5GoRhO3J yCAZsFym8NKwSEXdP8NDJ3vLy6hn+OGyBPx8Cv18jqg2MirYnhPyvNBPmpuge4a2f057 tHq2SlMeHQ9JzZPbWXjEgWZBP+8vPDftB+9VX/3hpfJ6lNAwTj3wbqfTIcZ6ZsBAMB5w tLJZ5BfUDYzcwnfSmOhIjzuSagf/IIHsCw8y+xROAOc5khBUwyJ2dAqKSB0BrNG/uMwW +qz2k6cW+VOen9/jDad2bxFu4JLcH1p5b9lzjOEanM5S4CSFcQbIrnwovpnCWX0sG9O1 G4Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tC4OgjodvFGDVzLejl/KjuczeCv8rgg5+bI622PK+Ps=; b=PLbK8zXH5MX7qEiiAp3gMvCHFztkV/VC0kH/xGb/G/XokyFkXHOZguLnTJE/M9kKcQ wqA7zDFpOAmtrh6RXIlYZ+3TTKgpPr9jdW6a9QA06tofLNPg5pDPfNtE0R0TFndevv58 w2NHfLHCat/6jJSj8pkYDBdaHam8/HWDypSL6F77KH6rBTXLAjudBY0pbgHYuSlvSWdi Yvuuyw0HyneJ6Pq97ADsXXnuS11uyWVrD4tzLIVyS9lCYbP6gGV14zagAaqFq33mJKkp gREMSsBYHwkockwpkN7umrNibIqVWvgNKYYXlvDfpFENtmRtB/TpsG8ss+Mb3WAnbTGx rfaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dxmZmVRe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m55si2283272edc.17.2019.10.17.12.22.02; Thu, 17 Oct 2019 12:22:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dxmZmVRe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439378AbfJPWPj (ORCPT + 99 others); Wed, 16 Oct 2019 18:15:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:45972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730508AbfJPVzW (ORCPT ); Wed, 16 Oct 2019 17:55:22 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C21C621A4C; Wed, 16 Oct 2019 21:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262921; bh=OyUlPjNeANd8E09a9byU60G74exCztVEBMkvSlrpIsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dxmZmVReLay8DrQimj2CRzCRCyNmreOaSo/Y8bYjzCLxja1T9XJVrPrBd48tsfWki NVFP6za4MGp3HRnZrN1oCVDUH9OYTohSjt5M01k8zvbeQXjG55ur8j/z8EglwmKJAD Z38zRjIVSQe036NaLAeSGqsEkqn3exbEXZkGR5T0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Shilovsky , Steve French Subject: [PATCH 4.9 81/92] CIFS: Force reval dentry if LOOKUP_REVAL flag is set Date: Wed, 16 Oct 2019 14:50:54 -0700 Message-Id: <20191016214847.125905050@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pavel Shilovsky commit 0b3d0ef9840f7be202393ca9116b857f6f793715 upstream. Mark inode for force revalidation if LOOKUP_REVAL flag is set. This tells the client to actually send a QueryInfo request to the server to obtain the latest metadata in case a directory or a file were changed remotely. Only do that if the client doesn't have a lease for the file to avoid unneeded round trips to the server. Cc: Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/dir.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c @@ -830,10 +830,16 @@ lookup_out: static int cifs_d_revalidate(struct dentry *direntry, unsigned int flags) { + struct inode *inode; + if (flags & LOOKUP_RCU) return -ECHILD; if (d_really_is_positive(direntry)) { + inode = d_inode(direntry); + if ((flags & LOOKUP_REVAL) && !CIFS_CACHE_READ(CIFS_I(inode))) + CIFS_I(inode)->time = 0; /* force reval */ + if (cifs_revalidate_dentry(direntry)) return 0; else { @@ -844,7 +850,7 @@ cifs_d_revalidate(struct dentry *direntr * attributes will have been updated by * cifs_revalidate_dentry(). */ - if (IS_AUTOMOUNT(d_inode(direntry)) && + if (IS_AUTOMOUNT(inode) && !(direntry->d_flags & DCACHE_NEED_AUTOMOUNT)) { spin_lock(&direntry->d_lock); direntry->d_flags |= DCACHE_NEED_AUTOMOUNT;