From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04047C433ED for ; Wed, 28 Apr 2021 16:57:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE3196100B for ; Wed, 28 Apr 2021 16:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241253AbhD1Q6h (ORCPT ); Wed, 28 Apr 2021 12:58:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:45094 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbhD1Q6h (ORCPT ); Wed, 28 Apr 2021 12:58:37 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E894DB01E; Wed, 28 Apr 2021 16:57:50 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 24823DA783; Wed, 28 Apr 2021 18:55:28 +0200 (CEST) Date: Wed, 28 Apr 2021 18:55:27 +0200 From: David Sterba To: Linus Torvalds Cc: Al Viro , Josef Bacik , David Sterba , Linux Kernel Mailing List , linux-fsdevel , Miklos Szeredi Subject: Re: [git pull] fileattr series from Miklos Message-ID: <20210428165527.GN7604@suse.cz> Reply-To: dsterba@suse.cz Mail-Followup-To: dsterba@suse.cz, Linus Torvalds , Al Viro , Josef Bacik , David Sterba , Linux Kernel Mailing List , linux-fsdevel , Miklos Szeredi References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Tue, Apr 27, 2021 at 11:31:19AM -0700, Linus Torvalds wrote: > Btw, unrelated to that, this pull request got a conflict with > > 64708539cd23 ("btrfs: use btrfs_inode_lock/btrfs_inode_unlock inode > lock helpers") > > which I think I sorted out correctly (the "inode_lock()" is now done > by the VFS layer for the fileattr things, and the btrfs use of > "btrfs_inode_lock/btrfs_inode_unlock" ended up being undone). But just > to be safe I'm cc'ing the btrfs people involved. Please double-check > that I didn't screw something up. Checked, it's ok. Thanks.