From patchwork Mon Nov 5 15:21:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1698881 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 9DA62DF2AB for ; Mon, 5 Nov 2012 15:30:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933063Ab2KEP35 (ORCPT ); Mon, 5 Nov 2012 10:29:57 -0500 Received: from mail-yh0-f46.google.com ([209.85.213.46]:48417 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933006Ab2KEPW6 (ORCPT ); Mon, 5 Nov 2012 10:22:58 -0500 Received: by mail-yh0-f46.google.com with SMTP id m54so972001yhm.19 for ; Mon, 05 Nov 2012 07:22:58 -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=+KhpgzQOnxvD2IdzuSqu91T2kLHg1Y9h5lQcT5fuqTo=; b=nmohmBObs5EELtQ6ugX6Qt4cQ51pq+EtZPRfIkP3QtZGG5eTgoRTuxbI9/aC+4KOQI mX09RhvSjAw+V6tv3HojouvkTtX3v4tLKxHlS0FBNf2AMH0ZdmoPKO8voyMgd05P44XB Rv5QXcPkkf2g7jd18vJrG+A+RiyNC3tkJI/6H2kKHCZourwdBg+COpGgYKQj9c7cOCsp 54976tRKCvSWs4tvWowA2YC1E0HH9g8G3xu0ROLJA9t1ja97gigDMpybNL6jkhn5p6G+ eqgSKVY6KoujAchXwzKXW20nuAZ7S8b46CY6oDyzU8OVzCE83tdf3/XlSTfHnBRGHtAs kZbA== Received: by 10.101.175.12 with SMTP id c12mr2631395anp.48.1352128977922; Mon, 05 Nov 2012 07:22:57 -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.56 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:22:57 -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 20/34] vfs: allow utimensat() calls to retry once on an ESTALE error Date: Mon, 5 Nov 2012 10:21:59 -0500 Message-Id: <1352128933-28526-21-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: ALoCoQkNRcbGTyLHdWuUyctRVzNzax69izenWIMoPu+v+WqNSeDDe9TSNu8N93SnQAabXN/Uk+7G 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 | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/utimes.c b/fs/utimes.c index bb0696a..c9ce931 100644 --- a/fs/utimes.c +++ b/fs/utimes.c @@ -154,17 +154,22 @@ long do_utimes(int dfd, const char __user *filename, struct timespec *times, fdput(f); } else { struct path path; - int lookup_flags = 0; + unsigned 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: