From patchwork Mon Nov 5 15:21:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1698961 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A16B2DF2AB for ; Mon, 5 Nov 2012 15:31:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932956Ab2KEPWv (ORCPT ); Mon, 5 Nov 2012 10:22:51 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:33300 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932944Ab2KEPWt (ORCPT ); Mon, 5 Nov 2012 10:22:49 -0500 Received: by mail-gg0-f174.google.com with SMTP id k5so1001920ggd.19 for ; Mon, 05 Nov 2012 07:22:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=NdvuwT9keN3bLajRpkvZ5SKZ8UXdTDgT10P5ton9sJw=; b=Yq16NCXiMeAcw+8cs6H7XmFiKCawla5Sf/8ESd+2MyY1e0A46gx8zFu20xTjSvdbk0 BC355zlxcDDzfZRAuGuw0lQe35YaP9cKY0jk+9cx0xaykJ6S+ZcGRYXysvtv2O0qax+x Cjyh8FfgVKJLWMF6eZVSyJ7mfhRunDcV9QgyHe52TqHuDzcSv43e/IySmIPvzsJcRPPh kcybx7hCaPMoZ0CtAkzi5CjKcztsJqQkesbK4LeCmKgazER3Ps7dTAPee1ehqg6HP0yG RbeN6tzYDlRNIN8wzHkjnoUvuQhVTT5w1/6tp94K4Rb2lBbwMPyCHqF3b5AKZwsGqYxw nZBg== Received: by 10.236.143.4 with SMTP id k4mr9280180yhj.111.1352128968641; Mon, 05 Nov 2012 07:22:48 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id y18sm12026769anh.15.2012.11.05.07.22.46 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:22:47 -0800 (PST) From: Jeff Layton To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com Subject: [PATCH v9 15/34] vfs: have chdir retry lookup and call once on ESTALE error Date: Mon, 5 Nov 2012 10:21:54 -0500 Message-Id: <1352128933-28526-16-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkcmxE+UOMarX1eUkTZ5nJZQWmmyXeKdh09ySlBFHEiTqXkpPvNaU+CunvoOa/KU+dUgorz Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/open.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/open.c b/fs/open.c index 9cd0a50..5c2a973 100644 --- a/fs/open.c +++ b/fs/open.c @@ -387,20 +387,21 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename) { struct path path; int error; + int lookup_flags = LOOKUP_FOLLOW | LOOKUP_DIRECTORY; + unsigned int try = 0; - error = user_path_dir(filename, &path); - if (error) - goto out; - - error = inode_permission(path.dentry->d_inode, MAY_EXEC | MAY_CHDIR); - if (error) - goto dput_and_out; - - set_fs_pwd(current->fs, &path); + do { + error = user_path_at(AT_FDCWD, filename, lookup_flags, &path); + if (error) + break; -dput_and_out: - path_put(&path); -out: + error = inode_permission(path.dentry->d_inode, + MAY_EXEC | MAY_CHDIR); + if (!error) + set_fs_pwd(current->fs, &path); + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }