From be743f4fccd91cdd46faae38affb88fdc62fbd75 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Thu, 17 Dec 2009 21:24:24 -0500
Subject: [PATCH] --- yaml --- r: 207641 b: refs/heads/master c:
 098cf2fc77ee190c92bf9d08d69a13305f2487ec h: refs/heads/master i:   207639:
 9652c2567dc63ca849153ceb7d51f089a123f87e v: v3

---
 [refs]                                 | 2 +-
 trunk/fs/notify/inode_mark.c           | 2 ++
 trunk/include/linux/fsnotify_backend.h | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6f03b4e5b0f1..cc2ee6e39860 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4136510dd61a1ca151fc5b9d8c1ebd5a8ce2e8f4
+refs/heads/master: 098cf2fc77ee190c92bf9d08d69a13305f2487ec
diff --git a/trunk/fs/notify/inode_mark.c b/trunk/fs/notify/inode_mark.c
index 6731408c49f7..b00065842b3e 100644
--- a/trunk/fs/notify/inode_mark.c
+++ b/trunk/fs/notify/inode_mark.c
@@ -322,6 +322,8 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
 	if (unlikely(!inode))
 		return -EINVAL;
 
+	entry->flags = FSNOTIFY_MARK_FLAG_INODE;
+
 	/*
 	 * if this group isn't being testing for inode type events we need
 	 * to start testing
diff --git a/trunk/include/linux/fsnotify_backend.h b/trunk/include/linux/fsnotify_backend.h
index 0c0fd4ee2840..cf165857199b 100644
--- a/trunk/include/linux/fsnotify_backend.h
+++ b/trunk/include/linux/fsnotify_backend.h
@@ -267,6 +267,9 @@ struct fsnotify_mark_entry {
 		struct fsnotify_vfsmount_mark m;
 	};
 	struct list_head free_g_list;	/* tmp list used when freeing this mark */
+#define FSNOTIFY_MARK_FLAG_INODE	0x01
+#define FSNOTIFY_MARK_FLAG_VFSMOUNT	0x02
+	unsigned int flags;		/* vfsmount or inode mark? */
 	void (*free_mark)(struct fsnotify_mark_entry *entry); /* called on final put+free */
 };