From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-gg0-f174.google.com ([209.85.161.174]:50015 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757814Ab2EVOMm (ORCPT ); Tue, 22 May 2012 10:12:42 -0400 Received: by gglu4 with SMTP id u4so5398518ggl.19 for ; Tue, 22 May 2012 07:12:41 -0700 (PDT) From: Jeff Layton To: viro@ZenIV.linux.org.uk Cc: inux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, miklos@szeredi.hu, hch@infradead.org, michael.brantley@deshaw.com, pstaubach@exagrid.com Subject: [PATCH v2 09/15] vfs: fix mkdir to retry on ESTALE errors Date: Tue, 22 May 2012 10:12:13 -0400 Message-Id: <1337695939-2741-10-git-send-email-jlayton@redhat.com> In-Reply-To: <1337695939-2741-1-git-send-email-jlayton@redhat.com> References: <1337695939-2741-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Signed-off-by: Jeff Layton --- fs/namei.c | 43 ++++++++++++++++++++++++++----------------- 1 files changed, 26 insertions(+), 17 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index c3fbd44..812b978 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2677,26 +2677,35 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode) struct dentry *dentry; struct path path; int error; + char *name; + unsigned int try = 0; - dentry = user_path_create(dfd, pathname, &path, 1); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); - - if (!IS_POSIXACL(path.dentry->d_inode)) - mode &= ~current_umask(); - error = mnt_want_write(path.mnt); - if (error) - goto out_dput; - error = security_path_mkdir(&path, dentry, mode); - if (error) - goto out_drop_write; - error = vfs_mkdir(path.dentry->d_inode, dentry, mode); + name = getname(pathname); + if (IS_ERR(name)) + return PTR_ERR(name); + do { + dentry = kern_path_create(dfd, name, &path, true, try); + if (IS_ERR(dentry)) { + error = PTR_ERR(dentry); + break; + } + if (!IS_POSIXACL(path.dentry->d_inode)) + mode &= ~current_umask(); + error = mnt_want_write(path.mnt); + if (error) + goto out_dput; + error = security_path_mkdir(&path, dentry, mode); + if (error) + goto out_drop_write; + error = vfs_mkdir(path.dentry->d_inode, dentry, mode); out_drop_write: - mnt_drop_write(path.mnt); + mnt_drop_write(path.mnt); out_dput: - dput(dentry); - mutex_unlock(&path.dentry->d_inode->i_mutex); - path_put(&path); + dput(dentry); + mutex_unlock(&path.dentry->d_inode->i_mutex); + path_put(&path); + } while (retry_estale(error, try++)); + putname(name); return error; } -- 1.7.7.6