From patchwork Wed Aug 8 13:21:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1295651 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 179043FCFC for ; Wed, 8 Aug 2012 13:25:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964924Ab2HHNYn (ORCPT ); Wed, 8 Aug 2012 09:24:43 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:39317 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758484Ab2HHNWH (ORCPT ); Wed, 8 Aug 2012 09:22:07 -0400 Received: by mail-gg0-f174.google.com with SMTP id k6so15227ggd.19 for ; Wed, 08 Aug 2012 06:22:07 -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=H7GT3XiTjNF09CvhoTysXxuqu9GTVgW3zp+8XsvC1pg=; b=cyYfhlhr+eCYcywlc+YcIGODUAnByxUnNWMWIMjmSwA0a1n69jExC3yj6X2XbODGgH dERMpH3Rl+vIT8jaN6tc+qGlCDDqvuwFzp8k2t7WNN6l131XD+tFPFX5TPnTp4RbN2VI 43QJrG/n6LtdVMe3KMUYClgMS2WXE+Bsf/9lYjGLB6+RCv7C93dVv5lr3bzYfqgggP7M G5OfijQTJK0wez/CFuA3H8dDY42svE/FpEZaiwWgbojPSG9Uk6NhslIwmZOgEGBlyYAh NrWRBJvSN8DqLvnw/K45b7k6ywPKpooo+01zTN+ve+mtZwsdA07z4wBxgTQhBQja5zFG rfRQ== Received: by 10.236.76.3 with SMTP id a3mr16471527yhe.86.1344432127221; Wed, 08 Aug 2012 06:22:07 -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 l1sm24418002yhm.19.2012.08.08.06.22.05 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 06:22:06 -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 v5 14/19] vfs: fix renameat to retry on ESTALE errors Date: Wed, 8 Aug 2012 09:21:37 -0400 Message-Id: <1344432102-22312-15-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com> References: <1344432102-22312-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkzdZgGQYCBztjxNlunCi/znYSy+Nv2Xpc2EMsSM+UGAsH6EuohpO7B3VCFqiCYlDwh9h4X Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org ...as always, rename is the messiest of the bunch. We have to track whether to retry or not via a separate flag since the error handling is already quite complex. Signed-off-by: Jeff Layton --- fs/namei.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 0c112c3..936591f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3817,12 +3817,25 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, char *from; char *to; int error; + unsigned int try = 0; + bool should_retry = false; + unsigned int lookup_flags = LOOKUP_PARENT; - error = user_path_parent(olddfd, oldname, &oldnd, &from); - if (error) + from = getname(oldname); + if (IS_ERR(from)) + return PTR_ERR(from); + + to = getname(newname); + if (IS_ERR(to)) { + error = PTR_ERR(to); goto exit; + } +retry: + error = do_path_lookup(olddfd, from, lookup_flags, &oldnd); + if (error) + goto exit0; - error = user_path_parent(newdfd, newname, &newnd, &to); + error = do_path_lookup(newdfd, to, lookup_flags, &newnd); if (error) goto exit1; @@ -3891,13 +3904,21 @@ exit4: exit3: unlock_rename(new_dir, old_dir); mnt_drop_write(oldnd.path.mnt); + if (retry_estale(error, try++)) + should_retry = true; exit2: path_put(&newnd.path); - putname(to); exit1: path_put(&oldnd.path); - putname(from); + if (should_retry) { + should_retry = false; + lookup_flags |= LOOKUP_REVAL; + goto retry; + } +exit0: + putname(to); exit: + putname(from); return error; }