From patchwork Sat Oct 27 12:33:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655441 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 31C723FD4E for ; Sat, 27 Oct 2012 12:41:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754658Ab2J0MlH (ORCPT ); Sat, 27 Oct 2012 08:41:07 -0400 Received: from mail-ye0-f174.google.com ([209.85.213.174]:56913 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755172Ab2J0MeL (ORCPT ); Sat, 27 Oct 2012 08:34:11 -0400 Received: by mail-ye0-f174.google.com with SMTP id m12so638325yen.19 for ; Sat, 27 Oct 2012 05:34:11 -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=TunKft6iXLxF9lYzEmTd5MJVhGT3HDtgaZP5MB5kvdA=; b=Lft4JHF8wZovTBIoKTarTWFoCaUFbitH8WSQ+4m/+ggOxNXI/EYs85kFWg6QomayUp mYQfPFU/9CPpY/24T1h7SmKp3m4IsAZVtDYN/D1vBvNCAtjuAh7skQRu/gBBFdfnmNxG TNPZ2Z64EWpiP9BHVYky1obDl9msU5hakjPwYgcukWmJpMBQ7N6MPfDWvjSXR0fuzK3e v/9fE8v/7z28+GCZFHl6d9rp8f1Oky9bASbDxeyLVrqblGRYQ4r0RPsgB4aB/eHXvs8L rHIHGLVlRiXE1bAAWH/oFnqa1g8gWSDUi05Y7Q0+mS1+KF7RjukmL4J13HuPf4UIggIu OPWw== Received: by 10.236.87.77 with SMTP id x53mr25511264yhe.7.1351341251655; Sat, 27 Oct 2012 05:34:11 -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.10 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:10 -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 11/32] vfs: make do_unlinkat retry on ESTALE errors Date: Sat, 27 Oct 2012 08:33:18 -0400 Message-Id: <1351341219-17837-12-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: ALoCoQkwUsFv5tMc+V0tSVnaExHx8Fzn0RJKP/TCGU0LCN8AwxgH3wnIOPe5VjFdxvLXi3WpzYzv 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/namei.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 7c9bb50..467b9f1 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3446,9 +3446,13 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct filename *name; struct dentry *dentry; struct nameidata nd; - struct inode *inode = NULL; + struct inode *inode; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_PARENT; - name = user_path_parent(dfd, pathname, &nd, 0); +retry: + inode = NULL; + name = user_path_parent(dfd, pathname, &nd, try); if (IS_ERR(name)) return PTR_ERR(name); @@ -3486,6 +3490,10 @@ exit2: exit1: path_put(&nd.path); putname(name); + if (retry_estale(error, try++)) { + lookup_flags |= LOOKUP_REVAL; + goto retry; + } return error; slashes: