summaryrefslogtreecommitdiff
path: root/fs/notify/inotify/inotify_fsnotify.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-20 17:04:00 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-20 17:26:35 +1100
commit3baf68f92a57e6f09cff20194dbdfa2bdc4ea690 (patch)
treee457ad4ecd61664fcbc5faf3bb76169ff868292f /fs/notify/inotify/inotify_fsnotify.c
parent9cfef73307b0568cfbaff137ccb2a1febb174d05 (diff)
parentb38448e0fa6ae60a8444af9327f47ad6136d5429 (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'fs/notify/inotify/inotify_fsnotify.c')
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 871569c7d609..4216308b81b4 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -197,7 +197,6 @@ static void inotify_free_group_priv(struct fsnotify_group *group)
{
/* ideally the idr is empty and we won't hit the BUG in the callback */
idr_for_each(&group->inotify_data.idr, idr_callback, group);
- idr_remove_all(&group->inotify_data.idr);
idr_destroy(&group->inotify_data.idr);
atomic_dec(&group->inotify_data.user->inotify_devs);
free_uid(group->inotify_data.user);