From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753158AbeCMXRf (ORCPT ); Tue, 13 Mar 2018 19:17:35 -0400 Received: from ozlabs.org ([103.22.144.67]:47885 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbeCMXRe (ORCPT ); Tue, 13 Mar 2018 19:17:34 -0400 Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Date: Wed, 14 Mar 2018 10:17:04 +1100 From: Stephen Rothwell To: Chris Mason , Josef Bacik Cc: Jaegeuk Kim , Linus Torvalds , Linux F2FS Dev Mailing List , Linux Kernel Mailing List , Yufen Yu , Tejun Heo , David Sterba Subject: Re: [GIT PULL] f2fs update for 4.16-rc1 Message-ID: <20180314101704.51aaae7f@canb.auug.org.au> In-Reply-To: <20180201092551.759f32be@canb.auug.org.au> References: <20180130223220.GB65489@jaegeuk-macbookpro.roam.corp.google.com> <20180131095446.443670dc@canb.auug.org.au> <20180131002535.GD65489@jaegeuk-macbookpro.roam.corp.google.com> <20180201092551.759f32be@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/cQL6WivoQHU9fMUBzUeHdZm"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/cQL6WivoQHU9fMUBzUeHdZm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 1 Feb 2018 09:25:51 +1100 Stephen Rothwell w= rote: > > On Tue, 30 Jan 2018 16:25:35 -0800 Jaegeuk Kim wrote: > > > > On 01/31, Stephen Rothwell wrote: =20 > > >=20 > > > On Tue, 30 Jan 2018 14:32:20 -0800 Jaegeuk Kim w= rote: =20 > > > > > > > > Could you please consider the below pull request? > > > >=20 > > > > Thanks, > > > >=20 > > > > The following changes since commit ace52288edf0cb5e7a52b681f057f862= 24c49c27: > > > >=20 > > > > Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-m= td (2017-12-18 16:18:01 -0800) > > > >=20 > > > > are available in the Git repository at: > > > >=20 > > > > git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git ta= gs/f2fs-for-4.16-rc1 > > > >=20 > > > > for you to fetch changes up to 1c1d35df71104c76a4a2e25862926f22c334= c9d6: > > > >=20 > > > > f2fs: support inode creation time (2018-01-25 14:10:39 -0800) = =20 > > >=20 > > > This has an interesting conflict with the btrfs tree: > > >=20 > > > ---------------------------------------------------------------------= -- > > > After merging the f2fs tree, today's linux-next build (x86_64 > > > allmodconfig) failed like this: > > >=20 > > > /home/sfr/next/next/fs/f2fs/super.c: In function 'f2fs_fill_super': > > > /home/sfr/next/next/fs/f2fs/super.c:2563:18: error: 'SB_I_CGROUPWB' u= ndeclared (first use in this function); did you mean 'S_CGROUPWB'? > > > sb->s_iflags |=3D SB_I_CGROUPWB; > > > ^~~~~~~~~~~~~ > > > S_CGROUPWB > > >=20 > > > Caused by commit > > >=20 > > > 578c647879f7 ("f2fs: implement cgroup writeback support") > > >=20 > > > interacting with commit > > >=20 > > > 34934189a3dd ("cgroup, writeback: replace SB_I_CGROUPWB with per-in= ode S_CGROUPWB" > > >=20 > > > from the btrfs tree. > > >=20 > > > I have reverted the f2fs tree commit for today, but a better resoluti= on > > > would be appreciated. > > > ---------------------------------------------------------------------= -- > > >=20 > > > I have seen no response to the above email and have been reverting th= at > > > commit since Jan 18. =20 > >=20 > > I think this can be addressed by: > >=20 > > diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c > > index 89c838bfb067..c743b73976d0 100644 > > --- a/fs/f2fs/inode.c > > +++ b/fs/f2fs/inode.c > > @@ -48,9 +48,10 @@ void f2fs_set_inode_flags(struct inode *inode) > > new_fl |=3D S_DIRSYNC; > > if (f2fs_encrypted_inode(inode)) > > new_fl |=3D S_ENCRYPTED; > > + new_fl |=3D S_CGROUPWB; > > inode_set_flags(inode, new_fl, > > S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC| > > - S_ENCRYPTED); > > + S_ENCRYPTED|S_CGROUPWB); > > } > >=20 > > static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *r= i) > > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > > index 8173ae688814..ebcd58476fc7 100644 > > --- a/fs/f2fs/super.c > > +++ b/fs/f2fs/super.c > > @@ -2560,7 +2560,6 @@ static int f2fs_fill_super(struct super_block *sb= , void *data, int silent) > > sb->s_flags =3D (sb->s_flags & ~SB_POSIXACL) | > > (test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0); > > memcpy(&sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid)); > > - sb->s_iflags |=3D SB_I_CGROUPWB; > >=20 > > /* init f2fs-specific super block info */ > > sbi->valid_super_block =3D valid_super_block; > > =20 >=20 > I have applied that (by hand) as a merge fix patch for the merge of teh > btrfs tree for today. Thanks for the resolution. I am still applying this to the merge of the btrfs tree every day ... Commit 578c647879f7 ("f2fs: implement cgroup writeback support") was merged into Linus' tree on Jan 31. Here is the actual merge fix patch: From: Stephen Rothwell Date: Thu, 1 Feb 2018 09:21:06 +1100 Subject: [PATCH] f2fs: fixup for cgroup/writeback change Signed-off-by: Stephen Rothwell --- fs/f2fs/inode.c | 3 ++- fs/f2fs/super.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 205add3d0f3a..f34652c4288f 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -48,9 +48,10 @@ void f2fs_set_inode_flags(struct inode *inode) new_fl |=3D S_DIRSYNC; if (f2fs_encrypted_inode(inode)) new_fl |=3D S_ENCRYPTED; + new_fl |=3D S_CGROUPWB; inode_set_flags(inode, new_fl, S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC| - S_ENCRYPTED); + S_ENCRYPTED|S_CGROUPWB); } =20 static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8173ae688814..ebcd58476fc7 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2560,7 +2560,6 @@ static int f2fs_fill_super(struct super_block *sb, vo= id *data, int silent) sb->s_flags =3D (sb->s_flags & ~SB_POSIXACL) | (test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0); memcpy(&sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid)); - sb->s_iflags |=3D SB_I_CGROUPWB; =20 /* init f2fs-specific super block info */ sbi->valid_super_block =3D valid_super_block; --=20 2.15.1 --=20 Cheers, Stephen Rothwell --Sig_/cQL6WivoQHU9fMUBzUeHdZm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlqoW/AACgkQAVBC80lX 0GxD9gf+P78jBP1LVwaoqO0jhQw6MoYIFl+WcUMrZyMrSrZZ0o5hAj2bTU+YQUIe LSeqTj0h/fonemBa2UTcfxg7pms/lIFwhGzpKQQQ55HO6Lwox0Fvt5+5i+0J6XNj Ha3/vgg8s/abaF3qCvfHc863sonUf43xs2Qg8V8L45Td2S0ZS2PLIdXF8PuiRjTe lLIpzTZLj149qvUSP3E6x0B+NpN/bZZc3Xj6n3xgYl2BVn8i9C5RiRP7Uwk4sCj2 676JsKx1XwhfkANGjyXUwleDAISEy2amBxYxztayYa0eUIY5MbRYjZQbP2qGRO0H YH76ReMrNANyH8VsJSf4ZXJ6WQZspA== =jq5V -----END PGP SIGNATURE----- --Sig_/cQL6WivoQHU9fMUBzUeHdZm--