]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
reiserfs: replace inode uid,gid,mode initialization with helper function
authorDmitry Monakhov <dmonakhov@openvz.org>
Thu, 4 Mar 2010 14:32:19 +0000 (17:32 +0300)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 May 2010 22:31:26 +0000 (18:31 -0400)
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/reiserfs/namei.c

index d0c43cb99ffc3b87da5e68fbe6d94b5b20970e63..ee78d4a0086a983609749a72ec0fb840615255fd 100644 (file)
@@ -561,23 +561,13 @@ static int drop_new_inode(struct inode *inode)
 */
 static int new_inode_init(struct inode *inode, struct inode *dir, int mode)
 {
-
-       /* the quota init calls have to know who to charge the quota to, so
-        ** we have to set uid and gid here
-        */
-       inode->i_uid = current_fsuid();
-       inode->i_mode = mode;
        /* Make inode invalid - just in case we are going to drop it before
         * the initialization happens */
        INODE_PKEY(inode)->k_objectid = 0;
-
-       if (dir->i_mode & S_ISGID) {
-               inode->i_gid = dir->i_gid;
-               if (S_ISDIR(mode))
-                       inode->i_mode |= S_ISGID;
-       } else {
-               inode->i_gid = current_fsgid();
-       }
+       /* the quota init calls have to know who to charge the quota to, so
+        ** we have to set uid and gid here
+        */
+       inode_init_owner(inode, dir, mode);
        dquot_initialize(inode);
        return 0;
 }