From patchwork Sat Oct 27 12:33:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655351 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 3ACCEDFAC4 for ; Sat, 27 Oct 2012 12:39:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755924Ab2J0Mj2 (ORCPT ); Sat, 27 Oct 2012 08:39:28 -0400 Received: from mail-yh0-f46.google.com ([209.85.213.46]:65280 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755868Ab2J0MeX (ORCPT ); Sat, 27 Oct 2012 08:34:23 -0400 Received: by mail-yh0-f46.google.com with SMTP id m54so690985yhm.19 for ; Sat, 27 Oct 2012 05:34:23 -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=OGeZqW7xDVRx083FA+U5TLLVwAw9TUREx8mkgXL7ufE=; b=Vp8x7ydhTRNau0FFF5ZKAZTILTABO1pIarNNuCMFRM6coEtzMCV2LKWvr4F2gVNS+h sicR94uc7Y8xchZugCsmBLLvnmwSuITu/FN+aLJrm+ZEDFUpvuaqZZzPTUyrqjZbYQmX CqLMvgx4CkNITtrP1fCOQlRa7/DHdioT9+ldFuJXzclgXkt41weEXg2v2Yd793jxCSlR 0Fenxhu+J5KTVS2qbIVSqGXqlrg13uFRUg+sWJeagj67qdMoQKHMGEpzEbZg+8XW2ROF APtVBh1R8Ae1yy2mUNVAb6JIwzXdC10rJ02/2NWNl2ZJw4ZxBIAcs7dyfxERDuALFuFK 4hNA== Received: by 10.236.122.148 with SMTP id t20mr24718167yhh.19.1351341263132; Sat, 27 Oct 2012 05:34:23 -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.21 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:22 -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 18/32] vfs: make fchownat retry once on ESTALE errors Date: Sat, 27 Oct 2012 08:33:25 -0400 Message-Id: <1351341219-17837-19-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: ALoCoQmVMhdJjW2ho0pcuRbxq9Sb+f4Ht4p/Xx2sMnXBtSa9EuVFah6Xq1/QH1ULvMWekkbbiKzn 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/open.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/fs/open.c b/fs/open.c index 06f04bd..abb52b9 100644 --- a/fs/open.c +++ b/fs/open.c @@ -564,24 +564,29 @@ SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user, struct path path; int error = -EINVAL; int lookup_flags; + unsigned int try = 0; if ((flag & ~(AT_SYMLINK_NOFOLLOW | AT_EMPTY_PATH)) != 0) - goto out; + return error; lookup_flags = (flag & AT_SYMLINK_NOFOLLOW) ? 0 : LOOKUP_FOLLOW; if (flag & AT_EMPTY_PATH) lookup_flags |= LOOKUP_EMPTY; - error = user_path_at(dfd, filename, lookup_flags, &path); - if (error) - goto out; - error = mnt_want_write(path.mnt); - if (error) - goto out_release; - error = chown_common(&path, user, group); - mnt_drop_write(path.mnt); -out_release: - path_put(&path); -out: + + do { + error = user_path_at(dfd, filename, lookup_flags, &path); + if (error) + break; + + error = mnt_want_write(path.mnt); + if (!error) { + error = chown_common(&path, user, group); + mnt_drop_write(path.mnt); + } + + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }