Re: kernel bug 2.6.31-rc6 (2)

[Christoph Thielecke]

Hello Eric,

> On Wed, 2009-08-19 at 14:48 +0200, Christoph Thielecke wrote:
> > Aug 19 14:05:03 develop kernel: kernel BUG at
> > fs/notify/inotify/inotify_fsnotify.c:109!
>
> Can you apply the following patch?  It cleans up some logic, which I
> didn't see a problem with, but it makes it very easy for me to know it's
> right now.  It also should prevent the BUG() you hit from bringing down
> the box.

> commit da9d447e409fdca12001378650f020982093e91e
> Author: Eric Paris <eparis@xxxxxxxxxx>
> Date:   Wed Aug 19 17:01:12 2009 -0400
>
>     inotify: the inotify add watch code is horrible clean it up
>
>     Just reworking the inotify watch add code to be readable, clean, and
> full of a lot less gotos.
>
>     Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
>
> diff --git a/fs/notify/inotify/inotify_fsnotify.c
> b/fs/notify/inotify/inotify_fsnotify.c index d11ac71..1df198b 100644

The patch does not apply clean:

develop:/usr/src/linux-2.6.git.linus# patch -p1 
< /home/crissi/download2/inotify_fsnotify_test.patch
patching file fs/notify/inotify/inotify_fsnotify.c
Hunk #1 succeeded at 107 (offset -72 lines).
patching file fs/notify/inotify/inotify_user.c
Hunk #1 FAILED at 431.

Is it against 2.6.31-rc6 or current git? I have 2.6.31-rc6-00195-gc124891.
I did an update to latest from linus and try to apply your patch but it fails 
there too (no changes in the files after update from git).


Best regards

Christoph
-- 
Linux User Group Wernigerode
http://www.lug-wr.de/

Attachment: signature.asc
Description: This is a digitally signed message part.