inotify: start watch descriptor count at 1

The inotify_add_watch man page specifies that inotify_add_watch() will
return a non-negative integer. However, historically the inotify
watches started at 1, not at 0.

Turns out that the inotifywait program provided by the inotify-tools
package doesn't properly handle a 0 watch descriptor. In 7e790dd5 we
changed from starting at 1 to starting at 0. This patch starts at 1,
just like in previous kernels, but also just like in previous kernels
it's possible for it to wrap back to 0. This preserves the kernel
functionality exactly like it was before the patch (neither method broke
the spec)

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Eric Paris and committed by Linus Torvalds 08e53fcb cd94c8bb

+1 -1
+1 -1
fs/notify/inotify/inotify_user.c
··· 567 568 spin_lock_init(&group->inotify_data.idr_lock); 569 idr_init(&group->inotify_data.idr); 570 - group->inotify_data.last_wd = 0; 571 group->inotify_data.user = user; 572 group->inotify_data.fa = NULL; 573
··· 567 568 spin_lock_init(&group->inotify_data.idr_lock); 569 idr_init(&group->inotify_data.idr); 570 + group->inotify_data.last_wd = 1; 571 group->inotify_data.user = user; 572 group->inotify_data.fa = NULL; 573