From 01826057e7b703599e7c638ad239337f8a10bdca Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Thu, 17 Dec 2009 21:24:28 -0500
Subject: [PATCH] --- yaml --- r: 207675 b: refs/heads/master c:
 90dd201d1ab064512078a77762a793e0bf5f3040 h: refs/heads/master i:   207673:
 4f475d8e347b38c513d77c753e17dad487dd1e7a   207671:
 a4c1f2860d3b1a1bc22615d8b4b3947341a8aec8 v: v3

---
 [refs]                                   |  2 +-
 trunk/fs/notify/fanotify/fanotify_user.c | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index d827d4d2822d..246eddadc3c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52202dfbd9107787dc68a2019cc7be4e79f52e5c
+refs/heads/master: 90dd201d1ab064512078a77762a793e0bf5f3040
diff --git a/trunk/fs/notify/fanotify/fanotify_user.c b/trunk/fs/notify/fanotify/fanotify_user.c
index 7d7c13872852..db80a0d89d24 100644
--- a/trunk/fs/notify/fanotify/fanotify_user.c
+++ b/trunk/fs/notify/fanotify/fanotify_user.c
@@ -424,27 +424,6 @@ static int fanotify_add_inode_mark(struct fsnotify_group *group,
 	return 0;
 }
 
-static int fanotify_add_mark(struct fsnotify_group *group, struct inode *inode,
-			     struct vfsmount *mnt, __u32 mask)
-{
-	int ret;
-
-	pr_debug("%s: group=%p inode=%p mnt=%p mask=%x\n",
-		 __func__, group, inode, mnt, mask);
-
-	BUG_ON(inode && mnt);
-	BUG_ON(!inode && !mnt);
-
-	if (inode)
-		ret = fanotify_add_inode_mark(group, inode, mask);
-	else if (mnt)
-		ret = fanotify_add_vfsmount_mark(group, mnt, mask);
-	else
-		BUG();
-
-	return ret;
-}
-
 static bool fanotify_mark_validate_input(int flags,
 					 __u32 mask)
 {
@@ -542,7 +521,7 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,
 	/* create/update an inode mark */
 	switch (flags & (FAN_MARK_ADD | FAN_MARK_REMOVE)) {
 	case FAN_MARK_ADD:
-		ret = fanotify_add_mark(group, inode, NULL, mask);
+		ret = fanotify_add_inode_mark(group, inode, mask);
 		break;
 	case FAN_MARK_REMOVE:
 		ret = fanotify_remove_mark(group, inode, NULL, mask);