inotify: don't use idr_remove_all()
authorTejun Heo <tj@kernel.org>
Thu, 28 Feb 2013 01:03:48 +0000 (17:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Feb 2013 03:10:14 +0000 (19:10 -0800)
idr_destroy() can destroy idr by itself and idr_remove_all() is being
deprecated.  Drop its usage.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: John McCutchan <john@johnmccutchan.com>
Cc: Robert Love <rlove@rlove.org>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/notify/inotify/inotify_fsnotify.c

index 871569c7d609360688c229e1357d3610e44841d0..4216308b81b409443d8e38430752e346ff30341a 100644 (file)
@@ -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);