---

yaml --- r: 120680 b: refs/heads/master c: 4c9c544 h: refs/heads/master v: v3
git-mirror · Nov 13, 2008 · 52a30d9 · 52a30d9
1 parent ba879d3
commit 52a30d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a2f90e9fae0824e8b6b123f1ea7d9fff9079ef3
+refs/heads/master: 4c9c544e4987efe6643ad5692af47a0abfd4e0d1
diff --git a/trunk/fs/ext4/balloc.c b/trunk/fs/ext4/balloc.c
@@ -624,7 +624,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
 		return 1;
 
 	/* Hm, nope.  Are (enough) root reserved blocks available? */
-	if (sbi->s_resuid == current->fsuid ||
+	if (sbi->s_resuid == current_fsuid() ||
 	    ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
 	    capable(CAP_SYS_RESOURCE)) {
 		if (free_blocks >= (nblocks + dirty_blocks))

diff --git a/trunk/fs/ext4/ialloc.c b/trunk/fs/ext4/ialloc.c
@@ -785,15 +785,15 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode)
 		spin_unlock(sb_bgl_lock(sbi, flex_group));
 	}
 
-	inode->i_uid = current->fsuid;
+	inode->i_uid = current_fsuid();
 	if (test_opt(sb, GRPID))
 		inode->i_gid = dir->i_gid;
 	else if (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_gid = current_fsgid();
 	inode->i_mode = mode;
 
 	inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);