From patchwork Sat Oct 27 12:33:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655531 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 88A5CDFAC4 for ; Sat, 27 Oct 2012 12:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754885Ab2J0Mme (ORCPT ); Sat, 27 Oct 2012 08:42:34 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:64114 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754820Ab2J0MeB (ORCPT ); Sat, 27 Oct 2012 08:34:01 -0400 Received: by mail-gh0-f174.google.com with SMTP id g15so699683ghb.19 for ; Sat, 27 Oct 2012 05:34:01 -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=W4tF0XChraSc9TOCTPMwC9iZaB+LBLXK/UZy1HL89SY=; b=expQGxZw784DnWsq8Kc40ba3K3qOBKCVq6oPlLcKjX3qnuhWfXzMBXZ/wZal16Vkgz 2/VNYbmlJNM6LVt4ukSppejGkOC2ZzfZqd1XUdoTI+TZT0f9QYpgYFLKibAOgDnWBzHM /rUYb7of9qjhwNGvlZ55Flom6imIizxNbfS+eigtbjRY7zuA7fZJN18V5wRj88OjDq6P YCwC74K88qTLDK+u31wID2tjGKZEWjRAk+/wYQK1qJ39L8UxOa5eWFZ6vK+Xd6cHWZ6O 3wipfYMJDdLKU1X+p1NNRrawmVgm1lEQYmTjsn++0dbfOHKR8riebtH4jm9cq7PPORCU Zoag== Received: by 10.236.122.148 with SMTP id t20mr24717527yhh.19.1351341241446; Sat, 27 Oct 2012 05:34:01 -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.59 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:00 -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 07/32] vfs: fix symlinkat to retry on ESTALE errors Date: Sat, 27 Oct 2012 08:33:14 -0400 Message-Id: <1351341219-17837-8-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: ALoCoQl70tCnPgXjyT25p0aN6hqEAlYWSQpW/aOpMC/S0uAEqkVYFS7Iy6ho+uTUk9gD5YP0W183 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 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 6e8db3d..7def44b 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3525,21 +3525,25 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, struct filename *from; struct dentry *dentry; struct path path; + unsigned int try = 0; from = getname(oldname); if (IS_ERR(from)) return PTR_ERR(from); - dentry = user_path_create(newdfd, newname, &path, false, false); - error = PTR_ERR(dentry); - if (IS_ERR(dentry)) - goto out_putname; + do { + dentry = user_path_create(newdfd, newname, &path, false, false); + if (IS_ERR(dentry)) { + error = PTR_ERR(dentry); + break; + } - error = security_path_symlink(&path, dentry, from->name); - if (!error) - error = vfs_symlink(path.dentry->d_inode, dentry, from->name); - done_path_create(&path, dentry); -out_putname: + error = security_path_symlink(&path, dentry, from->name); + if (!error) + error = vfs_symlink(path.dentry->d_inode, dentry, + from->name); + done_path_create(&path, dentry); + } while (retry_estale(error, try++)); putname(from); return error; }