From a386c241546e477cbe015f789baceecd088e44ad Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 6 Feb 2009 11:35:57 -0500
Subject: [PATCH] --- yaml --- r: 131069 b: refs/heads/master c:
 42f15d77df8a7e8a2feb15041d5d30710ee7f951 h: refs/heads/master i:   131067:
 b24afbab584f6556ae34e36a9bc7873ec8225ad0 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1976f73ccdd7..60491a4125d3 100644
--- 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
index ddb0f0ecda6c..8f0706210a47 100644
--- 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;