linux-kernel - Re: linux-next: manual merge of the aio-direct tree with the vfs tree

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]

Date:	Mon, 11 Nov 2013 03:20:52 +0000
From:	Al Viro <viro@...IV.linux.org.uk>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Dave Kleikamp <dave.kleikamp@...cle.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the aio-direct tree with the vfs tree

On Mon, Nov 11, 2013 at 12:53:28PM +1100, Stephen Rothwell wrote:
> Hi Dave,
> 
> Today's linux-next merge of the aio-direct tree got a conflict in
> drivers/mtd/nand/nandsim.c between commit 72c2d5319200 ("file->f_op is
> never NULL...") from the vfs tree and commit dd458300240b ("fs: create
> file_readable() and file_writable() functions") from the aio-direct tree.
> 
> I fixed it up (I just used the aio-direct tree version) and can carry the
> fix as necessary (no action is required).

Hrm...  Pity that this thing sits in the middle of aio-direct; it would
make more sense to take it in vfs.git ;-/  There are several more places
where we get the conflicts of the same sort.

FWIW, I have two nitpicks with these helpers:
	a) checks for NULL argument do not belong there
	b) please, please, do not breed more instances of that stupid
'filp' thing; AFAICS, it's an example of really bad taste on part of
AST - it stands for 'file pointer' and yes, it's a minixism.  Linus has
used that naming convention in 0.01 and it spread when people copied
stuff.  There's a perfectly good identifier - 'file'...
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/