From ef83969f322da36b8c12ca03194937308d032a4d Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Thu, 5 Apr 2012 14:25:09 -0700
Subject: [PATCH] --- yaml --- r: 298651 b: refs/heads/master c:
 20955e891d828b2027281fe3295dae6af8e0423b h: refs/heads/master i:   298649:
 911547ec0a9a8b3753ec0f25b79911481f513ba2   298647:
 d32d99b652b72ad6d6e387b6ce796cd50eedc93e v: v3

---
 [refs]                   | 2 +-
 trunk/fs/libfs.c         | 8 ++++++++
 trunk/include/linux/fs.h | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b49fee365a30..367ae5643089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7563ec4c211ba59c2331dc6b94a068250345c387
+refs/heads/master: 20955e891d828b2027281fe3295dae6af8e0423b
diff --git a/trunk/fs/libfs.c b/trunk/fs/libfs.c
index 4a0d1f06da57..358094f0433d 100644
--- a/trunk/fs/libfs.c
+++ b/trunk/fs/libfs.c
@@ -264,6 +264,13 @@ struct dentry *mount_pseudo(struct file_system_type *fs_type, char *name,
 	return ERR_PTR(-ENOMEM);
 }
 
+int simple_open(struct inode *inode, struct file *file)
+{
+	if (inode->i_private)
+		file->private_data = inode->i_private;
+	return 0;
+}
+
 int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
 	struct inode *inode = old_dentry->d_inode;
@@ -984,6 +991,7 @@ EXPORT_SYMBOL(simple_dir_operations);
 EXPORT_SYMBOL(simple_empty);
 EXPORT_SYMBOL(simple_fill_super);
 EXPORT_SYMBOL(simple_getattr);
+EXPORT_SYMBOL(simple_open);
 EXPORT_SYMBOL(simple_link);
 EXPORT_SYMBOL(simple_lookup);
 EXPORT_SYMBOL(simple_pin_fs);
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index c437f914d537..c64c31d3ab2c 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -2502,6 +2502,7 @@ extern int dcache_readdir(struct file *, void *, filldir_t);
 extern int simple_setattr(struct dentry *, struct iattr *);
 extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
 extern int simple_statfs(struct dentry *, struct kstatfs *);
+extern int simple_open(struct inode *inode, struct file *file);
 extern int simple_link(struct dentry *, struct inode *, struct dentry *);
 extern int simple_unlink(struct inode *, struct dentry *);
 extern int simple_rmdir(struct inode *, struct dentry *);