---

yaml --- r: 207615 b: refs/heads/master c: 31ddd32 h: refs/heads/master i: 207613: cc580f9 207611: 5b14ef2 207607: 6320d0a 207599: 1786822 207583: 42f1651 207551: b9f742e 207487: f6d7708 207359: 361bb93 v: v3
git-mirror · Jul 28, 2010 · 2cf5886 · 2cf5886
1 parent d0325b7
commit 2cf5886
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4277d3dd5a7400c1ea7fd4e7d64bda8899f84f5
+refs/heads/master: 31ddd3268dcb6c1d70e9930a83be43bf86e4bf17
diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c
@@ -550,7 +550,9 @@ void inotify_ignored_and_remove_idr(struct fsnotify_mark_entry *entry,
 /* ding dong the mark is dead */
 static void inotify_free_mark(struct fsnotify_mark_entry *entry)
 {
-	struct inotify_inode_mark_entry *ientry = (struct inotify_inode_mark_entry *)entry;
+	struct inotify_inode_mark_entry *ientry;
+
+	ientry = container_of(entry, struct inotify_inode_mark_entry, fsn_entry);
 
 	kmem_cache_free(inotify_inode_mark_cachep, ientry);
 }