From 65db981bed1cfd03376e2778d4a4d9f014c32fa0 Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <dmonakhov@openvz.org>
Date: Thu, 4 Mar 2010 17:29:14 +0300
Subject: [PATCH] --- yaml --- r: 197973 b: refs/heads/master c:
 a1bd120d13e586ea1c424048fd2c8420a442852a h: refs/heads/master i:   197971:
 bd1b12d844286f358e94aa76716342c2d3ee5a57 v: v3

---
 [refs]                   |  2 +-
 trunk/fs/inode.c         | 20 ++++++++++++++++++++
 trunk/include/linux/fs.h |  3 ++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7871e16034c..32b433de051d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52957fe1c709d5ca3732456d73f4e4d95492c72c
+refs/heads/master: a1bd120d13e586ea1c424048fd2c8420a442852a
diff --git a/trunk/fs/inode.c b/trunk/fs/inode.c
index 498b10f04c3c..2bee20ae3d65 100644
--- a/trunk/fs/inode.c
+++ b/trunk/fs/inode.c
@@ -1606,3 +1606,23 @@ void init_special_inode(struct inode *inode, umode_t mode, dev_t rdev)
 				  inode->i_ino);
 }
 EXPORT_SYMBOL(init_special_inode);
+
+/**
+ * Init uid,gid,mode for new inode according to posix standards
+ * @inode: New inode
+ * @dir: Directory inode
+ * @mode: mode of the new inode
+ */
+void inode_init_owner(struct inode *inode, const struct inode *dir,
+			mode_t mode)
+{
+	inode->i_uid = current_fsuid();
+	if (dir && dir->i_mode & S_ISGID) {
+		inode->i_gid = dir->i_gid;
+		if (S_ISDIR(mode))
+			mode |= S_ISGID;
+	} else
+		inode->i_gid = current_fsgid();
+	inode->i_mode = mode;
+}
+EXPORT_SYMBOL(inode_init_owner);
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 9626c5fbb0e1..8a733862a411 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1428,7 +1428,8 @@ extern void dentry_unhash(struct dentry *dentry);
  * VFS file helper functions.
  */
 extern int file_permission(struct file *, int);
-
+extern void inode_init_owner(struct inode *inode, const struct inode *dir,
+			mode_t mode);
 /*
  * VFS FS_IOC_FIEMAP helper definitions.
  */