From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-gg0-f174.google.com ([209.85.161.174]:33402 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760734Ab2IGOS7 (ORCPT ); Fri, 7 Sep 2012 10:18:59 -0400 Received: by ggdk6 with SMTP id k6so539998ggd.19 for ; Fri, 07 Sep 2012 07:18:59 -0700 (PDT) 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 v6 15/20] vfs: have chdir retry lookup and call once on ESTALE error Date: Fri, 7 Sep 2012 10:18:22 -0400 Message-Id: <1347027507-20956-16-git-send-email-jlayton@redhat.com> In-Reply-To: <1347027507-20956-1-git-send-email-jlayton@redhat.com> References: <1347027507-20956-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 a5a5c9a..81ba325 100644 --- a/fs/open.c +++ b/fs/open.c @@ -389,20 +389,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; } -- 1.7.11.4