Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 3 Dec 2020 14:57:31 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jens Axboe <axboe@kernel.dk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc:     Chao Yu <chao@kernel.org>, Chao Yu <yuchao0@huawei.com>,
        Christoph Hellwig <hch@lst.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the block tree with the f2fs tree
Message-ID: <20201203145731.1894ec90@canb.auug.org.au>
In-Reply-To: <20201203144348.70f139a9@canb.auug.org.au>
References: <20201203144348.70f139a9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/=1bMG=H84QhTOnL5l.E88d9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/=1bMG=H84QhTOnL5l.E88d9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> diff --cc fs/f2fs/checkpoint.c
> index 14ba1519639e,54a1905af052..000000000000
> --- a/fs/f2fs/checkpoint.c
> +++ b/fs/f2fs/checkpoint.c
> @@@ -1385,27 -1385,6 +1385,26 @@@ static void commit_checkpoint(struct f2
>   	f2fs_submit_merged_write(sbi, META_FLUSH);
>   }
>  =20
>  +static inline u64 get_sectors_written(struct block_device *bdev)
>  +{
> - 	return bdev->bd_part ?
> - 		(u64)part_stat_read(bdev->bd_part, sectors[STAT_WRITE]) : 0;
> ++	return (u64)part_stat_read(bdev, sectors[STAT_WRITE]) : 0;
                                                             ^^^^
Clearly, that should have been removed - I have done that now.

--=20
Cheers,
Stephen Rothwell

--Sig_/=1bMG=H84QhTOnL5l.E88d9
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/IYisACgkQAVBC80lX
0GzA0Af9EVTFd6o4vzJy7V5wrgoxVwrEz7vZl+Ck4cc4P0kjILMQfxjd4eFbV4yI
kcdigSNERQkmgEW8ctraHxoF77P+59FIV7IgdGSBDxYrXP06BAoezjzbYlpBxtGe
px97p2lCByi9vY1wBGab+fd7hAso/OR7KV4HuteYjdNnuC55In5R7bcNIPujcKdw
Em5YhcFR7Z5Y8/SNdD/uvU23kscVY6bzvIIPwpuU6BjW/omHVm6DPIW1MvrEtpMG
W/Qt5UA49BDoIWg+ND/8CB0t03f6RQFSg1LDoRml9+MBaHWaSspPOaLjcEhZYIKI
FCP9ImwwMZXfato1/WR9QbAfGHkaGw==
=pMwz
-----END PGP SIGNATURE-----

--Sig_/=1bMG=H84QhTOnL5l.E88d9--