lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inotify: clean up the inotify_add_watch out path

Browse Source 
inotify_add_watch explictly frees the unused inode mark, but it can just
use the generic code.  Just do that.

Signed-off-by: Eric Paris <eparis@redhat.com>
This commit is contained in:
Eric Paris
2010-05-11 17:16:23 -04:00
parent e7b702b1a8
commit 3dbc6fb6a3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/notify/inotify/inotify_user.c
View File

@@ -578,16 +578,13 @@ retry:
/* return the watch descriptor for this new entry */ /* return the watch descriptor for this new entry */
ret = tmp_ientry->wd; 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 this mark added a new event update the group mask */
if (mask & ~group->mask) if (mask & ~group->mask)
fsnotify_recalc_group_mask(group); fsnotify_recalc_group_mask(group);
out_err: out_err:
if (ret < 0) /* match the ref from fsnotify_init_markentry() */
kmem_cache_free(inotify_inode_mark_cachep, tmp_ientry); fsnotify_put_mark(&tmp_ientry->fsn_entry);
return ret; return ret;
} }