From 1352dd0a57d2534f6b95250a144550a296fa769c Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 8 Aug 2009 23:56:29 +0400
Subject: [PATCH] --- yaml --- r: 177389 b: refs/heads/master c:
 3d1e463158febf6e047897597722f768b15350cd h: refs/heads/master i:   177387:
 b7aa2937547cd9b82227054ddc3157e578c4652c v: v3

---
 [refs]                     |  2 +-
 trunk/fs/file_table.c      | 30 ++----------------------------
 trunk/include/linux/file.h |  3 ---
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 0827f23be37e..77bc3ebd8df4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc3808f8c354889982e7e323050f1e50ad99a009
+refs/heads/master: 3d1e463158febf6e047897597722f768b15350cd
diff --git a/trunk/fs/file_table.c b/trunk/fs/file_table.c
index f906ac8c9a9f..602a9ee3023a 100644
--- a/trunk/fs/file_table.c
+++ b/trunk/fs/file_table.c
@@ -171,32 +171,6 @@ struct file *alloc_file(struct vfsmount *mnt, struct dentry *dentry,
 	if (!file)
 		return NULL;
 
-	init_file(file, mnt, dentry, mode, fop);
-	return file;
-}
-EXPORT_SYMBOL(alloc_file);
-
-/**
- * init_file - initialize a 'struct file'
- * @file: the already allocated 'struct file' to initialized
- * @mnt: the vfsmount on which the file resides
- * @dentry: the dentry representing this file
- * @mode: the mode the file is opened with
- * @fop: the 'struct file_operations' for this file
- *
- * Use this instead of setting the members directly.  Doing so
- * avoids making mistakes like forgetting the mntget() or
- * forgetting to take a write on the mnt.
- *
- * Note: This is a crappy interface.  It is here to make
- * merging with the existing users of get_empty_filp()
- * who have complex failure logic easier.  All users
- * of this should be moving to alloc_file().
- */
-int init_file(struct file *file, struct vfsmount *mnt, struct dentry *dentry,
-	   fmode_t mode, const struct file_operations *fop)
-{
-	int error = 0;
 	file->f_path.dentry = dentry;
 	file->f_path.mnt = mntget(mnt);
 	file->f_mapping = dentry->d_inode->i_mapping;
@@ -210,13 +184,13 @@ int init_file(struct file *file, struct vfsmount *mnt, struct dentry *dentry,
 	 * that we can do debugging checks at __fput()
 	 */
 	if ((mode & FMODE_WRITE) && !special_file(dentry->d_inode->i_mode)) {
+		int error = 0;
 		file_take_write(file);
 		error = mnt_clone_write(mnt);
 		WARN_ON(error);
 	}
-	return error;
+	return file;
 }
-EXPORT_SYMBOL(init_file);
 
 void fput(struct file *file)
 {
diff --git a/trunk/include/linux/file.h b/trunk/include/linux/file.h
index 335a0a5c316e..6a8d3612eb2a 100644
--- a/trunk/include/linux/file.h
+++ b/trunk/include/linux/file.h
@@ -18,9 +18,6 @@ extern void drop_file_write_access(struct file *file);
 struct file_operations;
 struct vfsmount;
 struct dentry;
-extern int init_file(struct file *, struct vfsmount *mnt,
-		struct dentry *dentry, fmode_t mode,
-		const struct file_operations *fop);
 extern struct file *alloc_file(struct vfsmount *, struct dentry *dentry,
 		fmode_t mode, const struct file_operations *fop);