linux-kernel - Re: [GIT PULL] ext4 update for 2.6.36

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: <AANLkTinJQ7DQK8_0ngHrbZugFBCgyM5ETUPhcDSmYGP6@mail.gmail.com>
Date:	Sat, 7 Aug 2010 13:17:46 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	"Theodore Ts'o" <tytso@....edu>
Cc:	linux-ext4@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] ext4 update for 2.6.36

On Thu, Aug 5, 2010 at 9:23 PM, Theodore Ts'o <tytso@....edu> wrote:
>
> Which is hopefully what you want.  If you want exactly what is shown
> below, you can also pull the "next" branch, which omits the merge, and
> then you can deal with the merge conflict by hand.  The results should
> be the same either way.

I did that just to see what it looked like.

One annoyance: I now get

  fs/jbd2/transaction.c: In function ‘start_this_handle’:
  fs/jbd2/transaction.c:98: warning: unused variable ‘ts’

due to that 'ts' thing only being used for the CONFIG_JBD2_DEBUG case.
Please fix. I'd suggest putting that CONFIG_JBD2_DEBUG code in a
helper function of its own, and declaring 'ts' there instead.
Suggested patch (but with a horrible helper function name) attached.

               Linus

Download attachment "diff" of type "application/octet-stream" (1906 bytes)