From 19c2c0ca08ec6149f9de865c30c614573f10433c Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Fri, 2 May 2008 16:13:49 -0400
Subject: [PATCH] --- yaml --- r: 128764 b: refs/heads/master c:
 b9d86667c94e5fe4bf9f6aa500e7ff1138e717ff h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 74f80a2ecd63..443c912b3dab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fa8ec64f445aa932ba154053fe95432f30f2c6
+refs/heads/master: b9d86667c94e5fe4bf9f6aa500e7ff1138e717ff
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index c6fae29c0b9e..5204599e4309 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -2035,12 +2035,12 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir,
 
 static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
-	struct inode *inode;
+	struct inode *inode = NULL;
 	struct btrfs_trans_handle *trans;
 	struct btrfs_root *root = BTRFS_I(dir)->root;
 	int err = 0;
 	int drop_on_err = 0;
-	u64 objectid;
+	u64 objectid = 0;
 	unsigned long nr = 1;
 
 	mutex_lock(&root->fs_info->fs_mutex);