From patchwork Sat Oct 27 12:33:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655511 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 EE676DFAC4 for ; Sat, 27 Oct 2012 12:42:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757790Ab2J0Mmf (ORCPT ); Sat, 27 Oct 2012 08:42:35 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:35875 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754724Ab2J0MeA (ORCPT ); Sat, 27 Oct 2012 08:34:00 -0400 Received: by mail-gh0-f174.google.com with SMTP id g15so699669ghb.19 for ; Sat, 27 Oct 2012 05:33:59 -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=HXoNFu2rk/6ZiNMBGOhOTyfhig7N5dyeBr8Z72S8qlw=; b=mP6EfrbZddBk+jSSCZtVyROnyFHIY2WRwYH0PNHxT2iVKEWGIe07z5/AkZhdU3B12M IggLaS5dMn6GIgVbJClkTxQVmv385ExOqVHkoqkU3ztuh8MtMIv0QIPPXnSzpj9kIxbf NR8hVqz4YnsaL3glTwdEP0NYBOsTYP5slCyQweZH7xQxVbGW4vG9WFYixbD8aY9vNDD0 +XxwKjLJG53Qs9EN1ptQ/dVwSSkTtBEcEmsayLMoo5UsUKFqg8chCLpPDVS+H9FvbCx+ CRhZTDZ4mXeW6lq2oOhS0kd7KyBcHVlitHOxMYfHTpy4C5AazOWMeUU63bvCpj0qKg8r kL1A== Received: by 10.236.86.73 with SMTP id v49mr25269570yhe.31.1351341239871; Sat, 27 Oct 2012 05:33:59 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id f15sm4124613yhi.11.2012.10.27.05.33.58 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:33: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 v8 06/32] vfs: fix mkdir to retry on ESTALE errors Date: Sat, 27 Oct 2012 08:33:13 -0400 Message-Id: <1351341219-17837-7-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351341219-17837-1-git-send-email-jlayton@redhat.com> References: <1351341219-17837-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmwhlM63RUc3cBc+UKDVvRzF9a/UF9m9ct0MjICdK//ktH+dR8mBvvxjrAX8KGCrqDzZN3K 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 | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 7b0ca39..6e8db3d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3250,17 +3250,20 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode) struct dentry *dentry; struct path path; int error; + unsigned int try = 0; - dentry = user_path_create(dfd, pathname, &path, true, false); - if (IS_ERR(dentry)) - return PTR_ERR(dentry); + do { + dentry = user_path_create(dfd, pathname, &path, true, false); + if (IS_ERR(dentry)) + return PTR_ERR(dentry); - if (!IS_POSIXACL(path.dentry->d_inode)) - mode &= ~current_umask(); - error = security_path_mkdir(&path, dentry, mode); - if (!error) - error = vfs_mkdir(path.dentry->d_inode, dentry, mode); - done_path_create(&path, dentry); + if (!IS_POSIXACL(path.dentry->d_inode)) + mode &= ~current_umask(); + error = security_path_mkdir(&path, dentry, mode); + if (!error) + error = vfs_mkdir(path.dentry->d_inode, dentry, mode); + done_path_create(&path, dentry); + } while (retry_estale(error, try++)); return error; }