From patchwork Fri Jun 29 18:57:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1133241 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 8FFE6DFF34 for ; Fri, 29 Jun 2012 19:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932732Ab2F2S6Y (ORCPT ); Fri, 29 Jun 2012 14:58:24 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:45325 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932675Ab2F2S6W (ORCPT ); Fri, 29 Jun 2012 14:58:22 -0400 Received: by mail-gg0-f174.google.com with SMTP id u4so3043977ggl.19 for ; Fri, 29 Jun 2012 11:58:21 -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=4pcLjcE1zvJlnamUAJzNx6t56xmnERkjA5n6eoY5wNU=; b=iwJoyvxzPMo9bEmZcEsaeJHvRGm/cqdyp+u9FhFgtzaK8ykXQDx4uvOvA/uiUCWYp7 PfIC6Y9mdHd3ZsHEcTqH3x5kBoXPzWyuEirei3rvJV+Bc0kzPBQ+51gaFVBmOAtWsQaX +jH1wYFD3vzbl3bWNyL6oSp5amRTJcF/KZ5MeXmw5MpNCJPy02MV1mS81L2ume8P0MP+ +H8BRDLRxvv2gnHX6YC9/pJLHT23rsNbqTEorQquQjq1pECii6xeHijXEmMvFHdDfAff Ouv+4cjdKTaWIha7O+fVntgbvDJgtdVKuZD/U1PT1rptReO3ovq8qOySvAxPnJyMOsKL 3tRg== Received: by 10.101.176.37 with SMTP id d37mr1265160anp.20.1340996301804; Fri, 29 Jun 2012 11:58:21 -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.20 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 11:58:21 -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 10/17] vfs: fix symlinkat to retry on ESTALE errors Date: Fri, 29 Jun 2012 14:57:53 -0400 Message-Id: <1340996280-27123-11-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: ALoCoQkOIMjklbWeVwBdpUVazGHzlEy/cOr+coR492WpdSNLRU8q9cZWqzEMYz/Vz61mF4ZnJ+RF 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 dec5713..a2d691a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3033,33 +3033,42 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, int, newdfd, const char __user *, newname) { int error; - char *from; + char *from, *to; 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, 0); - error = PTR_ERR(dentry); - if (IS_ERR(dentry)) - goto out_putname; + to = getname(newname); + if (IS_ERR(to)) { + putname(from); + return PTR_ERR(to); + } - error = mnt_want_write(path.mnt); - if (error) - goto out_dput; - error = security_path_symlink(&path, dentry, from); - if (error) - goto out_drop_write; - error = vfs_symlink(path.dentry->d_inode, dentry, from); + do { + dentry = kern_path_create(newdfd, to, &path, 0, try); + error = PTR_ERR(dentry); + if (IS_ERR(dentry)) + break; + + error = mnt_want_write(path.mnt); + if (error) + goto out_dput; + error = security_path_symlink(&path, dentry, from); + if (error) + goto out_drop_write; + error = vfs_symlink(path.dentry->d_inode, dentry, from); 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); -out_putname: + dput(dentry); + mutex_unlock(&path.dentry->d_inode->i_mutex); + path_put(&path); + } while (retry_estale(error, try++)); + putname(to); putname(from); return error; }