diff options
| author | John McCutchan <ttb@tentacle.dhs.org> | 2005-08-26 20:02:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 20:32:57 +0200 |
| commit | 7c657f2f25d50c602df9291bc6242b98fc090759 (patch) | |
| tree | 5e1ae11c320ea00488b33224cc982d0be2d986d6 | |
| parent | Ignore disabled ROM resources at setup (diff) | |
| download | linux-7c657f2f25d50c602df9291bc6242b98fc090759.tar.xz linux-7c657f2f25d50c602df9291bc6242b98fc090759.zip | |
[PATCH] Document idr_get_new_above() semantics, update inotify
There is an off by one problem with idr_get_new_above.
The comment and function name suggest that it will return an id >
starting_id, but it actually returned an id >= starting_id, and kernel
callers other than inotify treated it as such.
The patch below fixes the comment, and fixes inotifys usage. The
function name still doesn't match the behaviour, but it never did.
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/inotify.c | 2 | ||||
| -rw-r--r-- | lib/idr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/inotify.c b/fs/inotify.c index 868901b1e779..2e4e2a57708c 100644 --- a/fs/inotify.c +++ b/fs/inotify.c @@ -353,7 +353,7 @@ static int inotify_dev_get_wd(struct inotify_device *dev, do { if (unlikely(!idr_pre_get(&dev->idr, GFP_KERNEL))) return -ENOSPC; - ret = idr_get_new_above(&dev->idr, watch, dev->last_wd, &watch->wd); + ret = idr_get_new_above(&dev->idr, watch, dev->last_wd+1, &watch->wd); } while (ret == -EAGAIN); return ret; diff --git a/lib/idr.c b/lib/idr.c index c5be889de449..6415d053e2bf 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -207,7 +207,7 @@ build_up: } /** - * idr_get_new_above - allocate new idr entry above a start id + * idr_get_new_above - allocate new idr entry above or equal to a start id * @idp: idr handle * @ptr: pointer you want associated with the ide * @start_id: id to start search at |