From patchwork Fri Jun 29 18:57:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1133231 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 A12D7DFF34 for ; Fri, 29 Jun 2012 19:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932763Ab2F2TAN (ORCPT ); Fri, 29 Jun 2012 15:00:13 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:46821 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932675Ab2F2S6Y (ORCPT ); Fri, 29 Jun 2012 14:58:24 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so3038060yen.19 for ; Fri, 29 Jun 2012 11:58:24 -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=dhVejqxxz8uJ/Fb4qeNK6/sYMUJ28wHRjCkeB20yPLc=; b=fhIxdjn1sSd7HC6hKCQbjUFoQTidVB/go4tPLljtB930JUokYs8v/5Yt+YpvCzxbiH JP3UO6vJUE2cC4F9ou38CVsi1JR58If1+2qQPiHAj0MrdvZrkF8tm8jTpABKLFBI7X8J 6ASXon5YCOS8Scx1LLr+RBmQP0eblO3Ww7fThsKekFZv6Jb73RQy1QnN2eAsj3TIZkWj atJx88i3yu7KRuTVrPvnXYRI80WHqovzrB2fT74g0KhOVf4edx8VIebBKg2AFmighqb0 4vOpDTpFVBP2NVTWWvsCBMC4m7BFNRcyVv0SdzMzPPCCAX8nyFzx1ZHRyAImWwSTXI25 /y9g== Received: by 10.101.180.36 with SMTP id h36mr1223023anp.39.1340996304504; Fri, 29 Jun 2012 11:58:24 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id l13sm3936309ann.2.2012.06.29.11.58.23 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 11:58:23 -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 v3 12/17] vfs: make rmdir retry on ESTALE errors Date: Fri, 29 Jun 2012 14:57:55 -0400 Message-Id: <1340996280-27123-13-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkQFwDZ/Orimne5aQKywP6RJZtSQ4H3MSslnLrN5m/sGm9Ef3RcHx0amwRWGmoh/+QvJQZH 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 | 82 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 36 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index e902770..7fccc1c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2845,52 +2845,62 @@ out: static long do_rmdir(int dfd, const char __user *pathname) { int error = 0; - char * name; + char *name; struct dentry *dentry; struct nameidata nd; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_PARENT; - error = user_path_parent(dfd, pathname, &nd, &name); - if (error) - return error; + name = getname(pathname); + 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 { + error = do_path_lookup(dfd, name, lookup_flags, &nd); + if (error) + break; - nd.flags &= ~LOOKUP_PARENT; + 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; + } - 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 = mnt_want_write(nd.path.mnt); - if (error) - goto exit3; - error = security_path_rmdir(&nd.path, dentry); - if (error) - goto exit4; - error = vfs_rmdir(nd.path.dentry->d_inode, dentry); + nd.flags &= ~LOOKUP_PARENT; + + 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 = mnt_want_write(nd.path.mnt); + if (error) + goto exit3; + error = security_path_rmdir(&nd.path, dentry); + if (error) + goto exit4; + error = vfs_rmdir(nd.path.dentry->d_inode, dentry); exit4: - mnt_drop_write(nd.path.mnt); + mnt_drop_write(nd.path.mnt); exit3: - dput(dentry); + dput(dentry); exit2: - mutex_unlock(&nd.path.dentry->d_inode->i_mutex); + mutex_unlock(&nd.path.dentry->d_inode->i_mutex); exit1: - path_put(&nd.path); + path_put(&nd.path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); putname(name); return error; }