linux-kernel - Re: [GIT PULL] gfs2: 4.20 fixes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHc6FU7oZnb+-gwiAp5KRz1y1FEF-P6rMkSEhb9jC5eJ1_+U9Q@mail.gmail.com>
Date:   Thu, 15 Nov 2018 21:44:17 +0100
From:   Andreas Gruenbacher <agruenba@...hat.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     cluster-devel <cluster-devel@...hat.com>,
        LKML <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] gfs2: 4.20 fixes

On Thu, 15 Nov 2018 at 19:23, Linus Torvalds
<torvalds@...ux-foundation.org> wrote:
>
> On Thu, Nov 15, 2018 at 12:20 PM Andreas Gruenbacher
> <agruenba@...hat.com> wrote:
> >
> > I guess rebasing the for-next branch onto something more recent to
> > avoid the back-merge in the first place will be best, resulting in a
> > cleaner history.
>
> Rebases aren't really any better at all.
>
> If you have a real *reason* for a merge, do the merge. But then the
> reason should be clearly stated in the merge commit. Not just some
> random undocumented merge message. Tell why some other branch was
> relevant to your fix and needed to be pulled in.
>
> Better yet, don't do either merges or rebases.

Ok, I've changed the merge commit as follows now:

    Merge tag 'v4.20-rc1'

    Pull in the gfs2 fixes that went into v4.19-rc8:

      gfs2: Fix iomap buffered write support for journaled files
      gfs2: Fix iomap buffered write support for journaled files (2)

    Without these two commits, the following fix would cause conflicts.

So merging v4.19-rc8 would have been sufficient. v4.20-rc1 is what I
ended up testing, though.

Are you okay with that now?

Thanks,
Andreas

--

The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:

  Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
tags/gfs2-4.20.fixes3

for you to fetch changes up to 01ed1606d30966dc8fa255a941b2fc42d4e308a1:

  gfs2: Fix iomap buffer head reference counting bug (2018-11-15 21:31:58 +0100)

----------------------------------------------------------------
Fix two bugs leading to leaked buffer head references:

  gfs2: Put bitmap buffers in put_super
  gfs2: Fix iomap buffer head reference counting bug

And one bug leading to significant slow-downs when deleting large files:

  gfs2: Fix metadata read-ahead during truncate (2)

----------------------------------------------------------------
Andreas Gruenbacher (4):
      gfs2: Put bitmap buffers in put_super
      gfs2: Fix metadata read-ahead during truncate (2)
      Merge tag 'v4.20-rc1'
      gfs2: Fix iomap buffer head reference counting bug

 fs/gfs2/bmap.c | 54 +++++++++++++++++++++++++++---------------------------
 fs/gfs2/rgrp.c |  3 ++-
 2 files changed, 29 insertions(+), 28 deletions(-)