From patchwork Mon Nov 5 15:22:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1698751 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 D44F2DF2AB for ; Mon, 5 Nov 2012 15:27:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932676Ab2KEP1T (ORCPT ); Mon, 5 Nov 2012 10:27:19 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:33300 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933066Ab2KEPXP (ORCPT ); Mon, 5 Nov 2012 10:23:15 -0500 Received: by mail-gg0-f174.google.com with SMTP id k5so1001920ggd.19 for ; Mon, 05 Nov 2012 07:23:13 -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=7QOFOrl0o2fQUFVnnddljvUL5xm+yRDyn2gCKmBQXwM=; b=Jiq2Z6YB7E6OjDAx0iVVR5IyJ+X/kskOGE+JKnqzzT8T0kEMjtxRVr/QBHnb/bEl9w aWZr31nqDiaK4H3b+CmQTXVo2T+9noq56EEtkU96LWRTDhUZeaQqYBTzVvaWSssWY797 JrctsPn7GOvV8kIwbvATL+UY+8WvGdn1G2W/kBumGYTYpNSkfGAGK8AFYQDSQTZY8qS4 JO2XACW1ezNbx3malt1w9B1hTXGlYtIY1cqQGDJhVfTR6peIc8o1e8+w3cJy7wVIU05L djor/C/LJ0slvg0+LsCaf0CtojXdVxH4R4sAVyR7TlkbA6IwHss1Q8d9aeeihQLyaCsc UFmA== Received: by 10.236.75.228 with SMTP id z64mr9473189yhd.1.1352128993649; Mon, 05 Nov 2012 07:23:13 -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.23.11 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:23:12 -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 28/34] vfs: make lremovexattr retry once on ESTALE error Date: Mon, 5 Nov 2012 10:22:07 -0500 Message-Id: <1352128933-28526-29-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: ALoCoQm01YGlZR2BDsCWazKHO9MS92KwKri3s1/dAf+F0FasfnsjW4WiDZZM8ewXI3jZZI8CYpW+ 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 e2071ed..17d5135 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -668,16 +668,21 @@ SYSCALL_DEFINE2(lremovexattr, 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 = removexattr(path.dentry, name); - 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 = removexattr(path.dentry, name); + mnt_drop_write(path.mnt); + } + path_put(&path); + lookup_flags |= LOOKUP_REVAL; + } while (retry_estale(error, try++)); return error; }