From patchwork Fri Sep 7 14:18: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: 1422991 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 73CD13FC85 for ; Fri, 7 Sep 2012 14:26:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760706Ab2IGOSy (ORCPT ); Fri, 7 Sep 2012 10:18:54 -0400 Received: from mail-vb0-f46.google.com ([209.85.212.46]:43357 "EHLO mail-vb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760624Ab2IGOSl (ORCPT ); Fri, 7 Sep 2012 10:18:41 -0400 Received: by vbbff1 with SMTP id ff1so3363754vbb.19 for ; Fri, 07 Sep 2012 07:18:40 -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=+riNBGol4hyZM2562Xz9V8xmeXZyO/cu2p13U55wtbw=; b=D4IaPKRz6Gz1WID1VKkIIXgM/dfWSKc00HiGjf83POT5RPmM6Cy68nC+C1kWPjRSQo bPbNp2fBxIa0B80CTa7jg3RG7gCCGtti/3mMhmAkc2G50pauvUV611T5zALGh8F/s3oR IWhVQG/DdCgXke4Nl9Fx5+xWM8aHBj8rzZ6gfVzdg4SGyLG67HDZ27DrIHbXN+eDufSE BIVPfogLocefv2yn0p9STNROOtR1eJjC4NTZGvY1yuvLsOy72yAtCw9ee0I+EjPbsclT WKPnDW+JOfmIVRxV7fL+TOAe2w15/8t5RqZlYacEF76H1p40lDcGX71nGR5TNMFGjz3Y KdwA== Received: by 10.220.119.198 with SMTP id a6mr7427875vcr.23.1347027519959; Fri, 07 Sep 2012 07:18:39 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id v9sm3207113ves.8.2012.09.07.07.18.38 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 07:18:39 -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 03/20] vfs: fix readlinkat to retry on ESTALE Date: Fri, 7 Sep 2012 10:18:10 -0400 Message-Id: <1347027507-20956-4-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347027507-20956-1-git-send-email-jlayton@redhat.com> References: <1347027507-20956-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmgcb8/X61m5ozc7QRQvY1pTUeJN1U6pPlXFlAieEmuZy+hiFH1ezUMLar8YreLxUI5IyvG 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 d90258d..9719df1 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; }