---

yaml --- r: 131069 b: refs/heads/master c: 42f15d7 h: refs/heads/master i: 131067: b24afba v: v3
git-mirror · Feb 6, 2009 · a386c24 · a386c24
1 parent 6a5be42
commit a386c24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 806638bce99f51deccbfedbe86ab3c5cf55a1d35
+refs/heads/master: 42f15d77df8a7e8a2feb15041d5d30710ee7f951
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -3491,7 +3491,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 
 	inode->i_uid = current_fsuid();
 
-	if (dir->i_mode & S_ISGID) {
+	if (dir && (dir->i_mode & S_ISGID)) {
 		inode->i_gid = dir->i_gid;
 		if (S_ISDIR(mode))
 			mode |= S_ISGID;