From 3752aaf9d23ac16e2f984d080f1748d0cb1fd6bc Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 5 Aug 2009 18:35:21 +0400
Subject: [PATCH] --- yaml --- r: 177383 b: refs/heads/master c:
 825f9692fbe417b9fb529477056ba72022847038 h: refs/heads/master i:   177381:
 c6c9a89e516e446791304a6800ae9c340af6bb3c   177379:
 cc8486b95fc7874161c1bfad700a447ea284de79   177375:
 914754e8032cfe062dee60750d326b44752d002d v: v3

---
 [refs]                                 |  2 +-
 trunk/fs/notify/inotify/inotify_user.c | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index a628a3c4c36d..7569a223dcdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b42af81f0d7f95dff320f47d99c201925f406f5
+refs/heads/master: 825f9692fbe417b9fb529477056ba72022847038
diff --git a/trunk/fs/notify/inotify/inotify_user.c b/trunk/fs/notify/inotify/inotify_user.c
index 5ef5f365a5c8..9e4f90042eaf 100644
--- a/trunk/fs/notify/inotify/inotify_user.c
+++ b/trunk/fs/notify/inotify/inotify_user.c
@@ -659,12 +659,6 @@ SYSCALL_DEFINE1(inotify_init1, int, flags)
 	if (fd < 0)
 		return fd;
 
-	filp = get_empty_filp();
-	if (!filp) {
-		ret = -ENFILE;
-		goto out_put_fd;
-	}
-
 	user = get_current_user();
 	if (unlikely(atomic_read(&user->inotify_devs) >=
 			inotify_max_user_instances)) {
@@ -679,24 +673,25 @@ SYSCALL_DEFINE1(inotify_init1, int, flags)
 		goto out_free_uid;
 	}
 
-	filp->f_op = &inotify_fops;
-	filp->f_path.mnt = mntget(inotify_mnt);
-	filp->f_path.dentry = dget(inotify_mnt->mnt_root);
-	filp->f_mapping = filp->f_path.dentry->d_inode->i_mapping;
-	filp->f_mode = FMODE_READ;
+	atomic_inc(&user->inotify_devs);
+
+	filp = alloc_file(inotify_mnt, dget(inotify_mnt->mnt_root),
+			  FMODE_READ, &inotify_fops);
+	if (!filp)
+		goto Enfile;
+
 	filp->f_flags = O_RDONLY | (flags & O_NONBLOCK);
 	filp->private_data = group;
 
-	atomic_inc(&user->inotify_devs);
-
 	fd_install(fd, filp);
 
 	return fd;
 
+Enfile:
+	ret = -ENFILE;
+	atomic_dec(&user->inotify_devs);
 out_free_uid:
 	free_uid(user);
-	put_filp(filp);
-out_put_fd:
 	put_unused_fd(fd);
 	return ret;
 }