From e1677c8821339f2ab9114b0eb0a6a7abe8cec67d Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Tue, 11 May 2010 17:16:23 -0400 Subject: [PATCH] --- yaml --- r: 190865 b: refs/heads/master c: 3dbc6fb6a3c8a7dc164ae330ab024a3fe65ae53e h: refs/heads/master i: 190863: 206950935ca8e6419fca39f23a724923280c2e6d v: v3 --- [refs] | 2 +- trunk/fs/notify/inotify/inotify_user.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b1b69a284e54..727aedae9d12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7b702b1a8f2a6961367da903217e669be0f099f +refs/heads/master: 3dbc6fb6a3c8a7dc164ae330ab024a3fe65ae53e diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c index 472cdf29ef82..40da732eb73c 100644 --- a/trunk/fs/notify/inotify/inotify_user.c +++ b/trunk/fs/notify/inotify/inotify_user.c @@ -578,16 +578,13 @@ static int inotify_new_watch(struct fsnotify_group *group, /* return the watch descriptor for this new entry */ ret = tmp_ientry->wd; - /* match the ref from fsnotify_init_markentry() */ - fsnotify_put_mark(&tmp_ientry->fsn_entry); - /* if this mark added a new event update the group mask */ if (mask & ~group->mask) fsnotify_recalc_group_mask(group); out_err: - if (ret < 0) - kmem_cache_free(inotify_inode_mark_cachep, tmp_ientry); + /* match the ref from fsnotify_init_markentry() */ + fsnotify_put_mark(&tmp_ientry->fsn_entry); return ret; }