Prev: bit errors on spitz
Next: Different definition in div_sc and clocksource_cyc2ns
From: Linus Torvalds on 5 Mar 2010 16:30


On Fri, 5 Mar 2010, Jan Kara wrote:
>
> could you please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git for_linus
>
> You'll get lots of quota cleanups from Christoph which touch filesystems
> all over the place but it's just function renaming and moving quota calls
> from VFS into filesystems themselves.

Gaah. This interacted with the VFS stuff (the do_filp_open() cleanip in
particular) I merged from Al earlier today.

It really looked very trivial, so I fixed it up. Al had split up
do_filp_open() into several helper functions, and one of your changes was
to the old pre-split one. I felt confident enough about it that I just did
the obvious merge resolution, but you guys should check it out to be sure.

Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Al Viro on 5 Mar 2010 18:10
On Fri, Mar 05, 2010 at 01:24:35PM -0800, Linus Torvalds wrote:
>
>
> On Fri, 5 Mar 2010, Jan Kara wrote:
> >
> > could you please pull from
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git for_linus
> >
> > You'll get lots of quota cleanups from Christoph which touch filesystems
> > all over the place but it's just function renaming and moving quota calls
> > from VFS into filesystems themselves.
>
> Gaah. This interacted with the VFS stuff (the do_filp_open() cleanip in
> particular) I merged from Al earlier today.
>
> It really looked very trivial, so I fixed it up. Al had split up
> do_filp_open() into several helper functions, and one of your changes was
> to the old pre-split one. I felt confident enough about it that I just did
> the obvious merge resolution, but you guys should check it out to be sure.

It's OK as merge resolution, but I really wonder if that patch (taking
quota initialization to filesystems) is a good idea. It adds boilerplate
code that is easy to miss. And looking at what's done in e.g. ext2,
I'd say that places where it's added are lousy - if we want to do that
on directory modifications, we ought to take it into places that actually
create directory entries. Not to mention that we never shrink directories
there, so it should be just one call in ext2_add_link() instead of all
that pile.

Looks like a good case for a followup series, if nothing else.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: bit errors on spitz
Next: Different definition in div_sc and clocksource_cyc2ns