From patchwork Sat Oct 27 12:33:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655451 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3C8A8DFAC4 for ; Sat, 27 Oct 2012 12:41:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062Ab2J0Mlg (ORCPT ); Sat, 27 Oct 2012 08:41:36 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:53867 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755072Ab2J0MeK (ORCPT ); Sat, 27 Oct 2012 08:34:10 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so690907ggd.19 for ; Sat, 27 Oct 2012 05:34:10 -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=egRTfYnEARv0RBNiTopCXFdiprU9YHLJjyR90xXVuWg=; b=GSRelmqDCRu9xNntGZgc1wJybiH/bAYRDCZtEyiv+1HI+B+zJ7WsqdKZSBP+VsMUcz 33XwPa2VukEoNws6dMfiX+njtq7LXYWMcTL2okzXT+O2U+4PxjoGwZHM9CHgl9XUwOvZ 9biQfKWkZpAbtBVZgkqacFEsyvF1mxPoGQI+rPj1vYkHdCYwClAwmF8ap5Zk+nQ6PyAU 6mIg63Znp9lXs0CSdfw5T0ooALt9S8+cpWnzL5u1ObLqnPfu4Q7VflXnbHbbiUViRsQx eTgpMFOqAZhptELtjpD0pj72VUPaCbcj4cV50I/ihvV9yQRp1zw/C7i7LLX8p1ynXHEl 6lyQ== Received: by 10.236.144.137 with SMTP id n9mr24670391yhj.107.1351341250061; Sat, 27 Oct 2012 05:34:10 -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.06 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:08 -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 10/32] vfs: make rmdir retry on ESTALE errors Date: Sat, 27 Oct 2012 08:33:17 -0400 Message-Id: <1351341219-17837-11-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: ALoCoQnJuXMNRvMO9lBXjvqH0tLXbrRbnFpgyPFGqrW+rbELd7/1FlnnoeZn0K5bXpon7BQHTM8q 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 | 81 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 47b6016..7c9bb50 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3344,49 +3344,56 @@ static long do_rmdir(int dfd, const char __user *pathname) struct filename *name; struct dentry *dentry; struct nameidata nd; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_PARENT; - name = user_path_parent(dfd, pathname, &nd, 0); - if (IS_ERR(name)) - return PTR_ERR(name); - - switch(nd.last_type) { - case LAST_DOTDOT: - error = -ENOTEMPTY; - goto exit1; - case LAST_DOT: - error = -EINVAL; - goto exit1; - case LAST_ROOT: - error = -EBUSY; - goto exit1; - } + do { + name = user_path_parent(dfd, pathname, &nd, try); + if (IS_ERR(name)) + return PTR_ERR(name); + + switch (nd.last_type) { + case LAST_DOTDOT: + error = -ENOTEMPTY; + goto exit1; + case LAST_DOT: + error = -EINVAL; + goto exit1; + case LAST_ROOT: + error = -EBUSY; + goto exit1; + } - nd.flags &= ~LOOKUP_PARENT; - error = mnt_want_write(nd.path.mnt); - if (error) - goto exit1; + nd.flags &= ~LOOKUP_PARENT; + error = mnt_want_write(nd.path.mnt); + if (error) + goto exit1; - mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT); - dentry = lookup_hash(&nd); - error = PTR_ERR(dentry); - if (IS_ERR(dentry)) - goto exit2; - if (!dentry->d_inode) { - error = -ENOENT; - goto exit3; - } - error = security_path_rmdir(&nd.path, dentry); - if (error) - goto exit3; - error = vfs_rmdir(nd.path.dentry->d_inode, dentry); + mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, + I_MUTEX_PARENT); + dentry = lookup_hash(&nd); + if (IS_ERR(dentry)) { + error = PTR_ERR(dentry); + goto exit2; + } + if (!dentry->d_inode) { + error = -ENOENT; + goto exit3; + } + error = security_path_rmdir(&nd.path, dentry); + if (error) + goto exit3; + error = vfs_rmdir(nd.path.dentry->d_inode, dentry); exit3: - dput(dentry); + dput(dentry); exit2: - mutex_unlock(&nd.path.dentry->d_inode->i_mutex); - mnt_drop_write(nd.path.mnt); + mutex_unlock(&nd.path.dentry->d_inode->i_mutex); + mnt_drop_write(nd.path.mnt); exit1: - path_put(&nd.path); - putname(name); + path_put(&nd.path); + lookup_flags |= LOOKUP_REVAL; + putname(name); + } while (retry_estale(error, try++)); return error; }