X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fnotify%2Finode_mark.c;h=0399bcbe09c83f02bdf1627b1dcfc6b12c316d5f;hb=b2e75eff5e859d0c294e7405958362b26a423c6e;hp=0a499d2c61918d25ce3f80240aee4b6265c34585;hpb=164bc6195139047faaf5ada1278332e99494803b;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
index 0a499d2..0399bcb 100644
--- a/fs/notify/inode_mark.c
+++ b/fs/notify/inode_mark.c
@@ -87,7 +87,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-#include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/writeback.h> /* for inode_lock */
 
@@ -190,7 +189,8 @@ void fsnotify_destroy_mark_by_entry(struct fsnotify_mark_entry *entry)
 	 * callback to the group function to let it know that this entry
 	 * is being freed.
 	 */
-	group->ops->freeing_mark(entry, group);
+	if (group->ops->freeing_mark)
+		group->ops->freeing_mark(entry, group);
 
 	/*
 	 * __fsnotify_update_child_dentry_flags(inode);
@@ -323,11 +323,11 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
 	spin_lock(&group->mark_lock);
 	spin_lock(&inode->i_lock);
 
-	entry->group = group;
-	entry->inode = inode;
-
 	lentry = fsnotify_find_mark_entry(group, inode);
 	if (!lentry) {
+		entry->group = group;
+		entry->inode = inode;
+
 		hlist_add_head(&entry->i_list, &inode->i_fsnotify_mark_entries);
 		list_add(&entry->g_list, &group->mark_entries);