From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 30/49] vfs: make rmdir retry on ESTALE errors Date: Mon, 1 Oct 2012 20:16:39 -0400 Message-ID: <1349137018-21948-31-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q920HnI8006730 for ; Mon, 1 Oct 2012 20:17:49 -0400 Received: from mail-gg0-f174.google.com (mail-gg0-f174.google.com [209.85.161.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q920H5PG018691 for ; Mon, 1 Oct 2012 20:17:48 -0400 Received: by mail-gg0-f174.google.com with SMTP id r5so1511468ggn.33 for ; Mon, 01 Oct 2012 17:17:48 -0700 (PDT) In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com 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 b73315d..0d0b1c0 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3347,49 +3347,56 @@ static long do_rmdir(int dfd, const char __user *pathname) struct getname_info *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; } -- 1.7.11.4