From patchwork Sat Oct 27 12:33:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655331 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 12D663FD4E for ; Sat, 27 Oct 2012 12:39:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755988Ab2J0MeY (ORCPT ); Sat, 27 Oct 2012 08:34:24 -0400 Received: from mail-yh0-f46.google.com ([209.85.213.46]:65280 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755416Ab2J0MeS (ORCPT ); Sat, 27 Oct 2012 08:34:18 -0400 Received: by mail-yh0-f46.google.com with SMTP id m54so690985yhm.19 for ; Sat, 27 Oct 2012 05:34:18 -0700 (PDT) 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=SgW1GLX2gVwbuvXjmz4Jz7fVz0A3mZBeUL55MkanxTNk34zVtrqs+Co6HWB75y/oSG ZNMd216FwiikPZhfJz5IaHsyFPVHmb3833rgzFshEcD71y8Vz3SG1SmV2n9FR4/ZhNEH 78cOR30r3/4bPJw/rMd+NMfG4c9GMT98l9fC2LGBzPSofLSuv91iFOMA2Ghq6RHTlcfY wG2e3/AtswZJ62sVe0kagxN5G7bVXRDOFFHG0kNWl6e/KOCZRuAMBMid2qbnS4kqhIgn cWBLrJf6VP4U1S5Q3AmTo5R/XAlDPvXga1kN9xgd6/STqPrmG1+8aZgqW5GPouRjs/HX MWrA== Received: by 10.236.117.33 with SMTP id i21mr25229803yhh.81.1351341258287; Sat, 27 Oct 2012 05:34:18 -0700 (PDT) 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 f15sm4124613yhi.11.2012.10.27.05.34.16 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:17 -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 v8 15/32] vfs: have chdir retry lookup and call once on ESTALE error Date: Sat, 27 Oct 2012 08:33:22 -0400 Message-Id: <1351341219-17837-16-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351341219-17837-1-git-send-email-jlayton@redhat.com> References: <1351341219-17837-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQka7n/HeUdrZnB8wOK3lCRBgn+v3AKRar6piYaXTZvdJLZX9wTDZRJlEYScoomQR9E5b8gZ 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; }