From patchwork Thu Jul 26 11:55:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1242261 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D66433FC5A for ; Thu, 26 Jul 2012 11:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752443Ab2GZL6x (ORCPT ); Thu, 26 Jul 2012 07:58:53 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:40413 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752435Ab2GZLzk (ORCPT ); Thu, 26 Jul 2012 07:55:40 -0400 Received: by mail-gg0-f174.google.com with SMTP id u4so1821110ggl.19 for ; Thu, 26 Jul 2012 04:55:40 -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=zKRBjjL3ImoYDsAlVaQPbeF5v4uNrRsYxgifXI2WcR8=; b=ixr6BaAH90IEjxElwsQ94dV8ioM2ERPfLVwiZsFsvJO0iSr0UnlKK19PxA4c74RbgP k3GfD99wJ3AVLEEF2oxStrhFmD//ElVbqIyBSHe/f/YHKdHTOmk05XTascuLS4JyKOSR nZOq4wJ9ZO2/n3vvC+9+grfpNkh6alOEJ0uh12zDkhwZ1SYdsKLFRXhmbIPEcYkXTKz3 ynHou+skIYc0RyFIMtsVfCUiBu/74xkUo6SOUxuguHqyIPmawouWd/cLKv4yNM2B6Z4L jmanEDY/5tXMnChXhO48TX7jYf/WjHjmFAPkX0X0uh1pmaO7NzryNov8WYl2dF8nG2Qx PrRw== Received: by 10.236.173.137 with SMTP id v9mr27785983yhl.0.1343303740437; Thu, 26 Jul 2012 04:55:40 -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 l12sm4436364ank.2.2012.07.26.04.55.39 (version=SSLv3 cipher=OTHER); Thu, 26 Jul 2012 04:55:39 -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 v4 09/17] vfs: fix mkdir to retry on ESTALE errors Date: Thu, 26 Jul 2012 07:55:12 -0400 Message-Id: <1343303720-11199-10-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1343303720-11199-1-git-send-email-jlayton@redhat.com> References: <1343303720-11199-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkwZF6pjAsOLMdeixmxfx0Ru8orVB5kiaD4PpTtebTtXlzwML2vyl8+40k84+UMpuNk7idi 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 | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6705757..4bec3f4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3051,26 +3051,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; }