* linux-next: manual merge of the aio-direct tree with the vfs tree
@ 2013-11-11 1:53 Stephen Rothwell
2013-11-11 1:59 ` Stephen Rothwell
2013-11-11 3:20 ` Al Viro
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2013-11-11 1:53 UTC (permalink / raw)
To: Dave Kleikamp, Al Viro; +Cc: linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the aio-direct tree with the vfs tree
2013-11-11 1:53 linux-next: manual merge of the aio-direct tree with the vfs tree Stephen Rothwell
@ 2013-11-11 1:59 ` Stephen Rothwell
2013-11-11 3:20 ` Al Viro
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2013-11-11 1:59 UTC (permalink / raw)
To: Dave Kleikamp, Al Viro; +Cc: linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the aio-direct tree with the vfs tree
2013-11-11 1:53 linux-next: manual merge of the aio-direct tree with the vfs tree Stephen Rothwell
2013-11-11 1:59 ` Stephen Rothwell
@ 2013-11-11 3:20 ` Al Viro
1 sibling, 0 replies; 4+ messages in thread
From: Al Viro @ 2013-11-11 3:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Dave Kleikamp, linux-next, linux-kernel
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'...
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the aio-direct tree with the vfs tree
@ 2013-11-11 1:58 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2013-11-11 1:58 UTC (permalink / raw)
To: Dave Kleikamp, Al Viro; +Cc: linux-next, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-11 3:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-11 1:53 linux-next: manual merge of the aio-direct tree with the vfs tree Stephen Rothwell
2013-11-11 1:59 ` Stephen Rothwell
2013-11-11 3:20 ` Al Viro
2013-11-11 1:58 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).