From patchwork Sat Oct 27 12:33:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655241 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 E3A893FD4E for ; Sat, 27 Oct 2012 12:37:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757088Ab2J0Mh5 (ORCPT ); Sat, 27 Oct 2012 08:37:57 -0400 Received: from mail-gh0-f174.google.com ([209.85.160.174]:35347 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756189Ab2J0Me3 (ORCPT ); Sat, 27 Oct 2012 08:34:29 -0400 Received: by mail-gh0-f174.google.com with SMTP id g15so699691ghb.19 for ; Sat, 27 Oct 2012 05:34:29 -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=QsJKA/fQSyGGhzLVe4JqA7RGrCk7sT45zFtS5da+P+s=; b=Q4MSIoYt3KgzZkQQg6X4D6LoHcbiTVqfreOuHxn7yfGfOELvKJw3VqbUV9/yaleG6O jhApIb9Wq6QuG1tmD87QhlO2V4P4h1wnvlvSWP9Zv6FzF8UsepEljv4NFZO/SkPS8QbZ 05/CjEmXjnD+qxE/LwBROaJNya7X6GeG9nZw+6nztN/DgU7oOTVkCOlcY83Y/u+f2FNd DdUsoLrhti2pEkaVNM2NgASIbEbJHPoZ1q8Au5ZEKfCyAcCZMlarvMBRYBKWRzxsj4mk 1VhN3feS1AxQJFsYfRw0YEcirEwLuVxNRHkSgwvTpSgpZB3phhJbX+Y1Kch+zj6sKAq5 Wt0w== Received: by 10.101.41.8 with SMTP id t8mr1277833anj.35.1351341269129; Sat, 27 Oct 2012 05:34:29 -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.27 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:28 -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 22/32] vfs: allow lsetxattr() to retry once on ESTALE errors Date: Sat, 27 Oct 2012 08:33:29 -0400 Message-Id: <1351341219-17837-23-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: ALoCoQn95YULUk2nMLzNzemi9bXeeUPXOu6mgvr8gxZMffNC2mmq/L6c2f4tgCECP/VRSjaNOc8E 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/xattr.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/fs/xattr.c b/fs/xattr.c index 5b6e48d..5a9ddba 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -394,16 +394,21 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname, { struct path path; int error; + unsigned int try = 0; + unsigned int lookup_flags = 0; - error = user_lpath(pathname, &path); - if (error) - return error; - error = mnt_want_write(path.mnt); - if (!error) { - error = setxattr(path.dentry, name, value, size, flags); - mnt_drop_write(path.mnt); - } - path_put(&path); + do { + error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path); + if (error) + break; + error = mnt_want_write(path.mnt); + if (!error) { + error = setxattr(path.dentry, name, value, size, flags); + mnt_drop_write(path.mnt); + } + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }