From patchwork Sat Oct 27 12:33:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655591 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 DE1723FD4E for ; Sat, 27 Oct 2012 12:43:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754901Ab2J0Mna (ORCPT ); Sat, 27 Oct 2012 08:43:30 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:47879 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754223Ab2J0Mdz (ORCPT ); Sat, 27 Oct 2012 08:33:55 -0400 Received: by mail-gh0-f174.google.com with SMTP id g15so699677ghb.19 for ; Sat, 27 Oct 2012 05:33:55 -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=3CBvm5GYmRxP7AIn7M7T7XOR6I86l+Lo/RYyGRoMXss=; b=DDIVt+6M6h6BwcZfPbASI/RAHtye25sshXQZMQa0npS4gfyIgBeQqkpEpKddcNyYp6 +e2l9ojl3qX22OlT+eDdMSFrkQPupVkS4zR5yffNITeQE9S3McK3qbX/eR99yxpj35r8 ew9H8gvduARFnh9DBfkdGBwPlAKOrMGK4gEtbAGo9tzMrEXOUGI3lgffWVIN/wFWeKXj SGTVslqbYJmRJ5Kf1pInKE/oVo9U9IBfpp6JUM7wlUi3h0qsZgnv6wKbALK4dW8rH9kL cxutWpVaaM9/R+puxyZfzb9OdDNA0PtsBRkA2nJrIifhYyNvcCwgFL+iqJplkvmwq2NU FJLw== Received: by 10.101.134.23 with SMTP id l23mr979264ann.63.1351341234970; Sat, 27 Oct 2012 05:33:54 -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.33.52 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:33:53 -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 03/32] vfs: fix readlinkat to retry on ESTALE Date: Sat, 27 Oct 2012 08:33:10 -0400 Message-Id: <1351341219-17837-4-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: ALoCoQnlMfZlgXDHaW/BzZfEV3g7FxfJH43rD5rb8WEGinAGRIhoxs6rofJlcHX0GKoKH0Jba4/i 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/stat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/stat.c b/fs/stat.c index c97a17e..452ee93 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -300,14 +300,21 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname, struct path path; int error; int empty = 0; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_EMPTY; if (bufsiz <= 0) return -EINVAL; - error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty); - if (!error) { - struct inode *inode = path.dentry->d_inode; + do { + struct inode *inode; + + error = user_path_at_empty(dfd, pathname, lookup_flags, + &path, &empty); + if (error) + break; + inode = path.dentry->d_inode; error = empty ? -ENOENT : -EINVAL; if (inode->i_op->readlink) { error = security_inode_readlink(path.dentry); @@ -318,7 +325,8 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname, } } path_put(&path); - } + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }