Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Document idr_get_new_above() semantics, update inotify

Browse source 
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>
This commit is contained in:
John McCutchan 2005-08-26 14:02:04 -04:00 committed by Linus Torvalds
parent 755528c860
commit 7c657f2f25
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/inotify.c
View file

@ -353,7 +353,7 @@ static int inotify_dev_get_wd(struct inotify_device *dev,
do { do {
if (unlikely(!idr_pre_get(&dev->idr, GFP_KERNEL))) if (unlikely(!idr_pre_get(&dev->idr, GFP_KERNEL)))
return -ENOSPC; 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); } while (ret == -EAGAIN);
return ret; return ret;

2
lib/idr.c
View file

@ -207,7 +207,7 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
} }
/** /**
* 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 * @idp: idr handle
* @ptr: pointer you want associated with the ide * @ptr: pointer you want associated with the ide
* @start_id: id to start search at * @start_id: id to start search at