From patchwork Mon Nov 5 15:21:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1699091 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 2CA91DF2AB for ; Mon, 5 Nov 2012 15:34:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932486Ab2KEPec (ORCPT ); Mon, 5 Nov 2012 10:34:32 -0500 Received: from mail-yh0-f46.google.com ([209.85.213.46]:54428 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932866Ab2KEPWe (ORCPT ); Mon, 5 Nov 2012 10:22:34 -0500 Received: by mail-yh0-f46.google.com with SMTP id m54so971899yhm.19 for ; Mon, 05 Nov 2012 07:22:34 -0800 (PST) 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=Caz8vqTg8bJNzGE7cGYu/S8gMB41Y3xSCklTqFcSYcs=; b=FBSJLXMxM2G+5WHJXhnywT/7ZaQ7YISAKOZTfb8gF36/TCMgue9QCG1xhm4ZdTDheq ZIZ1elaXpYvUuZai140cflFI6SQsjsPvf3VdEgWs1FmwyRBcRFiVzIGG5dmxUDwJML6F RB9j4NpVM5glzrOpqXA6E682YKECWy4jnhzedWB4MWkUk6bYyphtRrsWYbfyi8jeeuTR iBLZ/gGwOPFoAtuwUq/3V85cY4gt3L/iOeu+IJUgwIu+Qq8Pn3UnhIeBcXxVsp3pH+dk rKpFymrtDD+/kS0VPDJM6BlVdS1Sag+qmKNrFSgtjyhcaNkb9s5HEVMr+UgrGdUMDzy0 FEaw== Received: by 10.236.75.228 with SMTP id z64mr9471393yhd.1.1352128954052; Mon, 05 Nov 2012 07:22:34 -0800 (PST) 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 y18sm12026769anh.15.2012.11.05.07.22.31 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:22:32 -0800 (PST) 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 v9 07/34] vfs: fix symlinkat to retry on ESTALE errors Date: Mon, 5 Nov 2012 10:21:46 -0500 Message-Id: <1352128933-28526-8-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkdYyWnK17Yg/O0PXUBaRWD5v20V6p0cJXI0VPe7AvRLyWXgzRwckNf5UocsmudSvgC7rHe 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 04e4851..af1b473 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, try); + 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; }