From 05bdf71070e5f1db534dea2ee793173f77506f98 Mon Sep 17 00:00:00 2001 From: John McCutchan Date: Fri, 26 Aug 2005 14:02:04 -0400 Subject: [PATCH] --- yaml --- r: 5999 b: refs/heads/master c: 7c657f2f25d50c602df9291bc6242b98fc090759 h: refs/heads/master i: 5997: d3da341b1cf3cac430d024405308261ee8290549 5995: 0e28dfacdce163cb11b7cfa2fa609ca498bab200 5991: 4257b9cf26a420e1bc019dffa652d2bbe79676cc 5983: 19b9f435c9c80f9b862dcce3fa7a19b07c3d60b5 v: v3 --- [refs] | 2 +- trunk/fs/inotify.c | 2 +- trunk/lib/idr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 981ba223ddfd..3b06f3cbd98b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 755528c860b05fcecda1c88a2bdaffcb50760a7f +refs/heads/master: 7c657f2f25d50c602df9291bc6242b98fc090759 diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c index 868901b1e779..2e4e2a57708c 100644 --- a/trunk/fs/inotify.c +++ b/trunk/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/trunk/lib/idr.c b/trunk/lib/idr.c index c5be889de449..6415d053e2bf 100644 --- a/trunk/lib/idr.c +++ b/trunk/lib/idr.c @@ -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 * @ptr: pointer you want associated with the ide * @start_id: id to start search at