From patchwork Fri Jun 29 18:57:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1133261 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 31F80DFF34 for ; Fri, 29 Jun 2012 19:01:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932731Ab2F2TA6 (ORCPT ); Fri, 29 Jun 2012 15:00:58 -0400 Received: from mail-yw0-f42.google.com ([209.85.213.42]:40749 "EHLO mail-yw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932713Ab2F2S6U (ORCPT ); Fri, 29 Jun 2012 14:58:20 -0400 Received: by mail-yw0-f42.google.com with SMTP id q11so4407178yhf.1 for ; Fri, 29 Jun 2012 11:58:20 -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=ggDQ8iVnp0WlXsbaUFowwnWG1WbYxq44+/EqX0Kj+0A=; b=LQRCBbQPrQqvkIw8zn4j2CavojtQ6irKkX6zvIkWnwRrOEiR5u2FG/CwY20helNQHT /PuWjDVmtdlPfFvKK3TnzHuoLwMOAenoGmu/BtojgBQ8FLbwYVH8NsymGNl6/iCwh8pr 2MCza1lbs3f887Ru+wgVMzPzZz8yHQRzgKAUy9cczKfp5v8nXQXFexs4SN9KUZ/OwFgY 5bw1Q0UY6BibduzluO1XY5c86Zkz9KV1mcE0QN42oz7sy1Obga4YEBfUN4vyf9kjDBLm BV2B1hiEiuFqP4AmugHc0cKdUiNtu9TulU/VUgH/QFE1RLzpSAjRX82g0e80G3dMEoPy L2wA== Received: by 10.236.185.38 with SMTP id t26mr4560118yhm.92.1340996300487; Fri, 29 Jun 2012 11:58:20 -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.19 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 11:58:19 -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 09/17] vfs: fix mkdir to retry on ESTALE errors Date: Fri, 29 Jun 2012 14:57:52 -0400 Message-Id: <1340996280-27123-10-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: ALoCoQn6ldGcV2j8pgU3vW4/IVyt2DegNVePfNoLp70mC9rzwWeZBtDUDlAGcEvvcRBtevpFlvuV 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 files changed, 26 insertions(+), 17 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index ef3ccee..dec5713 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2744,26 +2744,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; }