From patchwork Sat Oct 27 12:33:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655301 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 15B76DFB7A for ; Sat, 27 Oct 2012 12:39:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756135Ab2J0Mi5 (ORCPT ); Sat, 27 Oct 2012 08:38:57 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:59451 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756070Ab2J0Me0 (ORCPT ); Sat, 27 Oct 2012 08:34:26 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so690906ggd.19 for ; Sat, 27 Oct 2012 05:34:26 -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=PyrRjG+oo8iqU3wCCW/mRUxtHmV1S5/8khWU3cuyJ7I=; b=eNukE+AK3xmRDSQ3qgFPSpx0dqEfS0rlx62a1ctLyG1O5Ji0sGHRzUDtw+7v7JDgmn gqVEsTARqpJyfOK7P+HGQLEXtg4xUrYHUK3Xa/W47qmTH56owVW5lFeBvN1e5cqV3BX9 6YqjcnGtn+XAGgtkjMbsmxX0eRJYJpiBD4xnWFPL1Lclah+cHqRLAfli/gkdO4dUVgk1 XjwTKp5JHoThMiCwQp2vJYE7MgR2xmL1FJ7ScdQie41yVt16xMcMoPz3kwkeGRjh/kjO DuHgDSm7oRuF3ag2qBzrYA/kwou+HiJSBFeLMiC8PTHOA8Ttic4ZnPvrP5bOO+EMqI0w UiBw== Received: by 10.101.142.10 with SMTP id u10mr7663977ann.24.1351341266098; Sat, 27 Oct 2012 05:34:26 -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.34.24 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:25 -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 20/32] vfs: allow utimensat() calls to retry once on an ESTALE error Date: Sat, 27 Oct 2012 08:33:27 -0400 Message-Id: <1351341219-17837-21-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: ALoCoQmy3rRgYU5L8gAq7ZCStRTENihZXMdZdAI9WcfGTdvlvWvnBSjNTguBpEN20it+2E7toWBO Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Clearly, we can't handle the NULL filename case, but we can deal with the case where there's a real pathname. Signed-off-by: Jeff Layton --- fs/utimes.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/utimes.c b/fs/utimes.c index bb0696a..2b91adc2 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -155,16 +155,21 @@ long do_utimes(int dfd, const char __user *filename, struct timespec *times, } else { struct path path; int lookup_flags = 0; + unsigned int try = 0; if (!(flags & AT_SYMLINK_NOFOLLOW)) lookup_flags |= LOOKUP_FOLLOW; - error = user_path_at(dfd, filename, lookup_flags, &path); - if (error) - goto out; + do { + error = user_path_at(dfd, filename, + lookup_flags, &path); + if (error) + break; - error = utimes_common(&path, times); - path_put(&path); + error = utimes_common(&path, times); + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); } out: