From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-gh0-f174.google.com ([209.85.160.174]:55556 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758445Ab2HHNV7 (ORCPT ); Wed, 8 Aug 2012 09:21:59 -0400 Received: by mail-gh0-f174.google.com with SMTP id r11so730334ghr.19 for ; Wed, 08 Aug 2012 06:21:59 -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 v5 08/19] vfs: fix mknodat to retry on ESTALE errors Date: Wed, 8 Aug 2012 09:21:31 -0400 Message-Id: <1344432102-22312-9-git-send-email-jlayton@redhat.com> In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com> References: <1344432102-22312-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Signed-off-by: Jeff Layton --- fs/namei.c | 51 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index f04ba14..0a0397f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3109,34 +3109,49 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, struct dentry *dentry; struct path path; int error; + char *name; + unsigned int try = 0; error = may_mknod(mode); if (error) return error; - dentry = user_path_create(dfd, filename, &path, 0); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); + name = getname(filename); + if (IS_ERR(name)) + return PTR_ERR(name); - if (!IS_POSIXACL(path.dentry->d_inode)) - mode &= ~current_umask(); - error = security_path_mknod(&path, dentry, mode, dev); - if (error) - goto out; - switch (mode & S_IFMT) { - case 0: case S_IFREG: - error = vfs_create(path.dentry->d_inode,dentry,mode,true); + do { + dentry = kern_path_create(dfd, name, &path, false, try); + if (IS_ERR(dentry)) { + error = PTR_ERR(dentry); break; - case S_IFCHR: case S_IFBLK: - error = vfs_mknod(path.dentry->d_inode,dentry,mode, - new_decode_dev(dev)); + } + + if (!IS_POSIXACL(path.dentry->d_inode)) + mode &= ~current_umask(); + error = security_path_mknod(&path, dentry, mode, dev); + if (error) + goto out; + switch (mode & S_IFMT) { + case 0: + case S_IFREG: + error = vfs_create(path.dentry->d_inode, dentry, + mode, true); break; - case S_IFIFO: case S_IFSOCK: - error = vfs_mknod(path.dentry->d_inode,dentry,mode,0); + case S_IFCHR: + case S_IFBLK: + error = vfs_mknod(path.dentry->d_inode, dentry, mode, + new_decode_dev(dev)); break; - } + case S_IFIFO: + case S_IFSOCK: + error = vfs_mknod(path.dentry->d_inode, dentry, + mode, 0); + } out: - done_path_create(&path, dentry); + done_path_create(&path, dentry); + } while (retry_estale(error, try++)); + putname(name); return error; } -- 1.7.11.2