From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 48/49] vfs: make removexattr retry once on ESTALE Date: Mon, 1 Oct 2012 20:16:57 -0400 Message-ID: <1349137018-21948-49-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q920IEGH020363 for ; Mon, 1 Oct 2012 20:18:14 -0400 Received: from mail-gh0-f174.google.com (mail-gh0-f174.google.com [209.85.160.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q920HBF1025426 for ; Mon, 1 Oct 2012 20:18:14 -0400 Received: by mail-gh0-f174.google.com with SMTP id g15so1538901ghb.33 for ; Mon, 01 Oct 2012 17:18:14 -0700 (PDT) In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-audit@redhat.com 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 db6c528..d29d5a4 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -642,16 +642,21 @@ SYSCALL_DEFINE2(removexattr, const char __user *, pathname, { struct path path; int error; + unsigned int try = 0; + unsigned int lookup_flags = LOOKUP_FOLLOW; - error = user_path(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; } -- 1.7.11.4