From patchwork Fri Sep 7 14:18:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1422771 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 1CFCCDF283 for ; Fri, 7 Sep 2012 14:21:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760764Ab2IGOTE (ORCPT ); Fri, 7 Sep 2012 10:19:04 -0400 Received: from mail-vb0-f46.google.com ([209.85.212.46]:48299 "EHLO mail-vb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760697Ab2IGOSs (ORCPT ); Fri, 7 Sep 2012 10:18:48 -0400 Received: by mail-vb0-f46.google.com with SMTP id ff1so3363912vbb.19 for ; Fri, 07 Sep 2012 07:18:48 -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=X/liIi8TxIoAAL+a0VnQHNpZke3seV/ytVJzWG3lBbY=; b=Nzkfrb6grd8OOeB5JmuS/hMbdV+Ndg/a+nqhUrm46AU3K93Ux91yuRbZlS15CVFHhH mwc+YDDPWjblP9k9dGJNEwKkL3S91L1vgRhD2hp7jlJ6B0X0dolRTIAnd8vagBgztj/m Xyqpowj1sUG3TPLJmHmRpFSctG7rsC8Ty4sJEKj4Ykng9qYEL4cqeG9BDhGP/HF6weZS H1Re0CeZBrNJi4fQwyBGO5mvnDtZW7ABu+RxSWBPnkRe5/fn6wv49wE3uRvn0nNcGlGh G9yUaAyDHR/hL6L1gzaakiMuBRFUN3TA+iltCA/W3AzloF67HbVRjNigqAzZxcJHgHe+ ud2A== Received: by 10.52.31.230 with SMTP id d6mr5908179vdi.87.1347027528073; Fri, 07 Sep 2012 07:18:48 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id v9sm3207113ves.8.2012.09.07.07.18.46 (version=SSLv3 cipher=OTHER); Fri, 07 Sep 2012 07:18:47 -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 v6 08/20] vfs: fix linkat to retry on ESTALE errors Date: Fri, 7 Sep 2012 10:18:15 -0400 Message-Id: <1347027507-20956-9-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347027507-20956-1-git-send-email-jlayton@redhat.com> References: <1347027507-20956-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkUx95VGNMGlyEu7S5N5I2lSyJnLz56dV9IoYNfMFZzJh05zU9K0OGmEIqTNoTLy8aOvsMF 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 | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index ac731fc..e05d6ee 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3612,6 +3612,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, struct path old_path, new_path; int how = 0; int error; + unsigned int try = 0; if ((flags & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) != 0) return -EINVAL; @@ -3629,30 +3630,35 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, if (flags & AT_SYMLINK_FOLLOW) how |= LOOKUP_FOLLOW; - error = user_path_at(olddfd, oldname, how, &old_path); - if (error) - return error; + do { + error = user_path_at(olddfd, oldname, how, &old_path); + if (error) + break; - new_dentry = user_path_create(newdfd, newname, &new_path, false, false); - error = PTR_ERR(new_dentry); - if (IS_ERR(new_dentry)) - goto out; + new_dentry = user_path_create(newdfd, newname, &new_path, + false, false); + error = PTR_ERR(new_dentry); + if (IS_ERR(new_dentry)) + goto out; - error = -EXDEV; - if (old_path.mnt != new_path.mnt) - goto out_dput; - error = may_linkat(&old_path); - if (unlikely(error)) - goto out_dput; - error = security_path_link(old_path.dentry, &new_path, new_dentry); - if (error) - goto out_dput; - error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry); + error = -EXDEV; + if (old_path.mnt != new_path.mnt) + goto out_dput; + error = may_linkat(&old_path); + if (unlikely(error)) + goto out_dput; + error = security_path_link(old_path.dentry, &new_path, + new_dentry); + if (error) + goto out_dput; + error = vfs_link(old_path.dentry, new_path.dentry->d_inode, + new_dentry); out_dput: - done_path_create(&new_path, new_dentry); + done_path_create(&new_path, new_dentry); out: - path_put(&old_path); - + path_put(&old_path); + how |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }