summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorRobert Love2005-08-15 18:27:54 +0200
committerLinus Torvalds2005-08-15 18:48:31 +0200
commit0bf955ce98cb3cf40e20d0cc435299eb76e8819e (patch)
treec1fd8207f7d7b3e1db7d0f28ffae88f0dc205083 /fs
parentRevert PCIBIOS_MIN_IO changes for 2.6.13 (diff)
downloadkernel-qcow2-linux-0bf955ce98cb3cf40e20d0cc435299eb76e8819e.tar.gz
kernel-qcow2-linux-0bf955ce98cb3cf40e20d0cc435299eb76e8819e.tar.xz
kernel-qcow2-linux-0bf955ce98cb3cf40e20d0cc435299eb76e8819e.zip
[PATCH] inotify: fix idr_get_new_above usage
We are saving the wrong thing in ->last_wd. We want the wd, not the return value. Signed-off-by: Robert Love <rml@novell.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/inotify.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inotify.c b/fs/inotify.c
index 27ebcac5e07f..868901b1e779 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -402,7 +402,7 @@ static struct inotify_watch *create_watch(struct inotify_device *dev,
return ERR_PTR(ret);
}
- dev->last_wd = ret;
+ dev->last_wd = watch->wd;
watch->mask = mask;
atomic_set(&watch->count, 0);
INIT_LIST_HEAD(&watch->d_list);