Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754515AbcLCDnv (ORCPT ); Fri, 2 Dec 2016 22:43:51 -0500 Received: from mx2.suse.de ([195.135.220.15]:50310 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751731AbcLCDnt (ORCPT ); Fri, 2 Dec 2016 22:43:49 -0500 Subject: Re: [PATCH] Revert "Btrfs: don't delay inode ref updates during log, replay" From: Jeff Mahoney To: Jiri Slaby References: <0b303b40-57c2-c95e-5e50-804e0c757482@suse.com> Cc: Chris Mason , "linux-kernel@vger.kernel.org" Message-ID: Date: Fri, 2 Dec 2016 22:22:55 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:50.0) Gecko/20100101 Thunderbird/50.0 MIME-Version: 1.0 In-Reply-To: <0b303b40-57c2-c95e-5e50-804e0c757482@suse.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2FVUoEacolMakbtctS4fJ1hDWho82WuqS" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3915 Lines: 104 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2FVUoEacolMakbtctS4fJ1hDWho82WuqS Content-Type: multipart/mixed; boundary="fxshUhdcqXkeFPKBHO0sTW1DO4sSeSA5C"; protected-headers="v1" From: Jeff Mahoney To: Jiri Slaby Cc: Chris Mason , "linux-kernel@vger.kernel.org" Message-ID: Subject: Re: [PATCH] Revert "Btrfs: don't delay inode ref updates during log, replay" References: <0b303b40-57c2-c95e-5e50-804e0c757482@suse.com> In-Reply-To: <0b303b40-57c2-c95e-5e50-804e0c757482@suse.com> --fxshUhdcqXkeFPKBHO0sTW1DO4sSeSA5C Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Whoops, the [PATCH] line should've specified more clearly: This only applies to linux-stable, 3.12.y. Sorry for any confusion. -Jeff On 12/2/16 10:21 PM, Jeff Mahoney wrote: > This reverts commit 644d10716875b24388680925d6c7502420987bfe. >=20 > The original patch for mainline, 6f8960541b1 (Btrfs: don't delay > inode ref updates during log replay) lists 1d52c78afbb (Btrfs: try > not to ENOSPC on log replay) as the only pre-3.18 dependency, but it > also depends on 67de11769bd (Btrfs: introduce the delayed inode ref > deletion for the single link inode), which was introduced in 3.14 > and isn't in 3.12.y. >=20 > The -stable commit added the check to btrfs_delayed_update_inode, > which may look similar to btrfs_delayed_delete_inode_ref, but it's > only superficial. The tops of both functions handle typical > delayed node boilerplate. The upshot is that the patch is harmless > since the caller already checks to see if we're doing log recovery, > so we're not breaking anything. It should be reverted because it > makes it appear as if this issue was fixed for users who did > backport 67de11769bd, when it is not. >=20 > Signed-off-by: Jeff Mahoney > --- > fs/btrfs/delayed-inode.c | 8 -------- > 1 file changed, 8 deletions(-) >=20 > diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c > index 34f33e1..269ac79 100644 > --- a/fs/btrfs/delayed-inode.c > +++ b/fs/btrfs/delayed-inode.c > @@ -1805,14 +1805,6 @@ int btrfs_delayed_update_inode(struct btrfs_tran= s_handle *trans, > struct btrfs_delayed_node *delayed_node; > int ret =3D 0; > =20 > - /* > - * we don't do delayed inode updates during log recovery because it > - * leads to enospc problems. This means we also can't do > - * delayed inode refs > - */ > - if (BTRFS_I(inode)->root->fs_info->log_root_recovering) > - return -EAGAIN; > - > delayed_node =3D btrfs_get_or_create_delayed_node(inode); > if (IS_ERR(delayed_node)) > return PTR_ERR(delayed_node); >=20 --=20 Jeff Mahoney SUSE Labs --fxshUhdcqXkeFPKBHO0sTW1DO4sSeSA5C-- --2FVUoEacolMakbtctS4fJ1hDWho82WuqS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQIcBAEBCAAGBQJYQjqQAAoJEB57S2MheeWy3zQQAJvsSs321wDzOS7WNY1p+dNJ DFZ+JvAz6C5/m5xloN7KzA0G2xY8+Ve2cDu/2S6XL++6qBxaeiLVuNQZnMAPkJyu fiis7qn5X9Znf6Jhx1XXEqeZVZXPHu7KqK/If9d/0xpgqsMQu4d5TIx0oo9dL809 75m87MSvpa5oZoF3spn2IAuCCYxl3FZo2Ij79Q1iUB+4EQ5KSZhpkt2rZabgUlGf YdKh6l7gOVb0NypSnhLMz4JeJwuh69DxHJfUGZRlcatQFXO+GTmRgwPhkYZ70MUX 9pOANVPfR8Tbw7aR+hE9aqzxlTV9GKgvP7IgNSqtJJjuksmoBSulf7ZQeVJlGkwg i1iwwrBF5POi3Rv0Eajed9ietaKsEslYWmTePUc/R+f3lSnKYiPmYit6hQ2VrWsL vWCdHfSAH5G/jguuzBEFZJJy+zM9BquU2YBhnUKjKN9bwb2dyYD9eEASh3sBzLd5 5kf7uYUkAZaMissUesVarhyQH/ckAqUR7t53wb0jkZBwBG4QSf6IQzR2p6fz3uRH xb0u8L0JXi7ajlTrS+25YbNQbFVB0fCecAxmp6yHfVJXzT9aQmvckza72rRz1q0C lwGBvmrywNI8usJWyNReask0fLOQDTdnjBdDUrxMi1SUcifRn6qRqu6LGC5MlcTN EsITqlkUIAwgEenLKf7B =OK28 -----END PGP SIGNATURE----- --2FVUoEacolMakbtctS4fJ1hDWho82WuqS--