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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

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).

There may be some question as to whether file_readable() needs to check
its filp argument for NULL, but that would require auditing all its call
sites.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

On Mon, 11 Nov 2013 12:53:28 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> There may be some question as to whether file_readable() needs to check
> its filp argument for NULL, but that would require auditing all its call
> sites.

Ignore that ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Al Viro]

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'...

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

Hi Dave,

Today's linux-next merge of the aio-direct tree got a conflict in
fs/read_write.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 used the aio-direct tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]