From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 6 Feb 2009 16:35:57 +0000 (-0500)
Subject: Btrfs: Make sure dir is non-null before doing S_ISGID checks
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=42f15d77df8a7e8a2feb15041d5d30710ee7f951;p=linux-2.6-omap-h63xx.git

Btrfs: Make sure dir is non-null before doing S_ISGID checks

The S_ISGID check in btrfs_new_inode caused an oops during subvol creation
because sometimes the dir is null.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ddb0f0ecda6..8f0706210a4 100644
--- a/fs/btrfs/inode.c
+++ b/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;