Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp1043528ybp; Thu, 17 Oct 2019 07:16:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvl9ffsOnNd09L+auC43z+Y3asRVtOzu2Evx7CvixJDiMBKmC+lBp3ljyrJA0AzBT24XQq X-Received: by 2002:a17:906:49d1:: with SMTP id w17mr3745608ejv.101.1571321784163; Thu, 17 Oct 2019 07:16:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571321784; cv=none; d=google.com; s=arc-20160816; b=qvA+wMJ3kNGRWl7sihCDGiV0fYirA0QGWyVtwwmQ/oqvhYguI6Be+O6NhObWCAVTNT YmHRN0wSCevHWU6E/rYWGEfIx9aBt9dsJF+pYmMPZM6bt4r6ZwbpoZOJ7TcPCp3yQeTX YpvMe0RnS3o5TnKK/yvU/+a7c6NscbEAektd0mHRe9BaDP256S/TgL6+Ya+B7BebeU1s BePZ0rJ/9tgopdQQkHg1gwqJ2L2h7hZUJPeO72X7zYIwgo3jUFNNBZ65xKEnODegbhZM Qcn8sn5L2ug1LHd27QeGq8PNDEzjO53ufLFzXuupLZI4u2Tskns0olCg0kM5GT7CxgPU XZwg== 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=Rx/R0i6p07PCC0eAmni2/xZSGwh6xBmVIG1mws/VvRV4BxElpgAClIAmOMOXNavSFi pqQThq1pILnZXkH2R7v2xMAkJ+GZiEWEVOwZbfR8PxYzXJvC3jISQgfC8zyIrhY3knfp pOguyjURl0+Jde3eqZitI7iNxbP+zOr36eAB5EqSKZSuwymGJWNyTMa+SiTnKtDPI/cl s/0BDfKNwRf9+e+D/RhZVkgoZFqC5cJVAyTVjmHh8aiQGm8t/BJsJ+jmRWEsRyxyC9MN MKFCbCOwuULoIUPVJUmWsXTbVX7djlViSqk6DpjzE6dde1WYLZ5bmzkTTCUAS25OC/Aw hVbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Oo41bmgC; 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 h7si1297867ejx.59.2019.10.17.07.16.01; Thu, 17 Oct 2019 07:16:24 -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=Oo41bmgC; 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 S2437605AbfJPVxv (ORCPT + 99 others); Wed, 16 Oct 2019 17:53:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:42980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437591AbfJPVxr (ORCPT ); Wed, 16 Oct 2019 17:53:47 -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 CBDD021925; Wed, 16 Oct 2019 21:53:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262827; bh=OyUlPjNeANd8E09a9byU60G74exCztVEBMkvSlrpIsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oo41bmgC68295rCBeCLhKDjro6BYJUSgndSnwWnqxN70aY3cUal0td5gg9KqJ+l32 Z76b0aztjAANSWLJM73HkrtvTMck22fuUDQGM0RJD1YdwFSO2IlOLOTeWVAc22F6EP KTWGURBbq2R1cse82Yc/PHfGXwPa8673vOv4sJXY= 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.4 69/79] CIFS: Force reval dentry if LOOKUP_REVAL flag is set Date: Wed, 16 Oct 2019 14:50:44 -0700 Message-Id: <20191016214827.621573775@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@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;