lkml.org 
[lkml]   [2009]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 2/3] inotify: do not BUG on idr entries at inotify destruction
    From
    Date
    On Mon, 2009-08-24 at 20:34 +0200, Frans Pop wrote:
    > Eric Paris wrote:
    >
    > > If an inotify watch is left in the idr when an fsnotify group is destroyed
    > > this will lead to a BUG. This is not a dangerous situation and really
    > > indicates a programming bug and leak of memory. This patch changes it to
    > > use a WARN and a printk rather than killing people's boxes.
    > >
    > > Signed-off-by: Eric Paris <eparis@redhat.com>
    > > ---
    > >
    > > --- a/fs/notify/inotify/inotify_fsnotify.c
    > > +++ b/fs/notify/inotify/inotify_fsnotify.c
    > > @@ -107,6 +107,16 @@ static bool inotify_should_send_event(struct
    > > fsnotify_group *group, struct inode
    > >
    > > static int idr_callback(int id, void *p, void *data)
    > > {
    > > + struct fsnotify_mark_entry *entry;
    > > + struct inotify_inode_mark_entry *ientry;
    > > +
    > > + entry = p;
    > > + ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
    > > +
    > > + WARN(1, "inotify closing but id=%d still in idr. Probably leaking memory\n", id); +
    > > + printk(KERN_WARNING "group=%p entry->group=%p inode=%p wd=%d\n",
    > > + data, entry->group, entry->inode, ientry->wd);
    > > BUG();
    > > return 0;
    > > }
    >
    > I suspect you intended to remove the BUG?

    You suspect correctly. :( I'll fix in my tree before I request a
    pull....

    -Eric



    \
     
     \ /
      Last update: 2009-08-24 21:13    [W:0.056 / U:0.996 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site