---

yaml
---
r: 197979
b: refs/heads/master
c: aab99c2
h: refs/heads/master
i:
  197977: 38a7403
  197975: b669787
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffba102d75a2e79ac9754841c6cf4a6dd6892c42
+refs/heads/master: aab99c2c26f74d90f615fcca534172dfc1c8bec2

trunk/fs/ext3/ialloc.c

@@ -538,16 +538,13 @@ struct inode *ext3_new_inode(handle_t *handle, struct inode * dir, int mode)
 	if (S_ISDIR(mode))
 		percpu_counter_inc(&sbi->s_dirs_counter);
 
-	inode->i_uid = current_fsuid();
-	if (test_opt (sb, GRPID))
-		inode->i_gid = dir->i_gid;
-	else if (dir->i_mode & S_ISGID) {
+
+	if (test_opt(sb, GRPID)) {
+		inode->i_mode = mode;
+		inode->i_uid = current_fsuid();
 		inode->i_gid = dir->i_gid;
-		if (S_ISDIR(mode))
-			mode |= S_ISGID;
 	} else
-		inode->i_gid = current_fsgid();
-	inode->i_mode = mode;
+		inode_init_owner(inode, dir, mode);
 
 	inode->i_ino = ino;
 	/* This is the optimal IO size (for stat), not the fs block size */